From 1b80246861daf9c4cb5e2ec0bb7a22b3e6fd5b53 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 18:56:55 +0200 Subject: [PATCH 01/25] Remove some unused files --- Makefile | 20 ------------------ generate.rb | 32 ----------------------------- latex_template.tex.erb | 46 ------------------------------------------ makefile_template.erb | 9 --------- 4 files changed, 107 deletions(-) delete mode 100644 Makefile delete mode 100755 generate.rb delete mode 100644 latex_template.tex.erb delete mode 100644 makefile_template.erb diff --git a/Makefile b/Makefile deleted file mode 100644 index ca5b5f5..0000000 --- a/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -INTERPRETER := ruby -GENERATOR='./generate.rb' - -MAKE_TARGETS=$(patsubst dates/%.yaml, dates/%/ALL, $(wildcard dates/*.yaml)) -CLEAN_TARGETS=$(patsubst dates/%.yaml, dates/%/*, $(wildcard dates/*.yaml)) -ALL: ${MAKE_TARGETS} - -clean: - rm -rf ${CLEAN_TARGETS} - -# Keep Makefiles -.SECONDARY: $(patsubst dates/%/ALL, dates/%/Makefile, $(MAKE_TARGETS)) - -dates/%/Makefile: dates/%.yaml $(wildcard decks/*.yaml) - mkdir -p $(shell dirname $@) - command -v $(INTERPRETER) || (printf "Could not find '%s' – Please install or add it to PATH!\n" $(INTERPRETER); exit 1) - $(INTERPRETER) $(GENERATOR) $< $(shell dirname $@) - -dates/%/ALL: dates/%/Makefile - $(MAKE) -C $(shell dirname $@) diff --git a/generate.rb b/generate.rb deleted file mode 100755 index 02a7fd6..0000000 --- a/generate.rb +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env ruby - -require 'yaml' -require 'erb' - -# Load files -lecture_path = ARGV[0] -lecture = YAML.load_file lecture_path -deck = YAML.load_file File.join("decks", lecture['deck']) - -# Convert pathes to be relative to outdir_path -deck.each do |name, files| - files.map! do |f| - File.join("..", "..", "content", f) - end -end - -# Prepare flat list of included .tex files -deck_files = [] -deck.each do |name, files| - deck_files.push *files -end - -outdir_path = ARGV[1] -makefile_template = ERB.new(File.read("makefile_template.erb")) -File.write File.join(outdir_path, "Makefile"), makefile_template.result - -latex_template = ERB.new(File.read("latex_template.tex.erb")) -notes=false -File.write File.join(outdir_path, "slides.tex"), latex_template.result -notes=true -File.write File.join(outdir_path, "slides_with_notes.tex"), latex_template.result diff --git a/latex_template.tex.erb b/latex_template.tex.erb deleted file mode 100644 index 70fb73d..0000000 --- a/latex_template.tex.erb +++ /dev/null @@ -1,46 +0,0 @@ -\documentclass[12pt, xcolor={svgnames,table}]{beamer} -%\documentclass[20pt,handout]{beamer} -\usetheme{Darmstadt} -\usepackage{graphicx} -%\usepackage[german]{babel} -\usepackage{ngerman} -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\usepackage{tikz} -\setbeamertemplate{footline}[frame number] -\usepackage{pgfpages} -\usepackage{csquotes} -\usepackage{comment} -<% if notes %> -\setbeameroption{show notes on second screen = right} -<% end %> - -\newcommand{\cc}[1]{\includegraphics[height=4mm]{../../img/#1.png}\hspace{1mm}} -\usepackage{ifthen} -\newcommand{\license}[2][]{\\#2\ifthenelse{\equal{#1}{}}{}{\\\scriptsize\url{#1}}} -\usepackage{textcomp} -\usepackage{hyperref} -\usepackage{media9} - -\pgfdeclareimage[height=.6cm]{c3d2logo}{./img/c3d2.pdf} - -\pgfdeclarelayer{foreground} -\pgfsetlayers{main,foreground} -\logo{\pgfputat{\pgfxy(-1,0)}{\pgfbox[center,base]{\pgfuseimage{c3d2logo}}}} - -\title{<%= lecture['title'] %>} -\author{\small <%= lecture['presenters'] %> \\\large <%= lecture['organization'] %>} -\date{<%= lecture['date'] %>} - -\begin{document} -\maketitle - -<% deck.each do |section, snippets| %> - \section{<%= section %>} - \subsection{} - <% snippets.each do |snippet| %> - \input{<%= snippet.sub(/\.tex$/, "") %>} - <% end %> -<% end %> - -\end{document} diff --git a/makefile_template.erb b/makefile_template.erb deleted file mode 100644 index 95c1f25..0000000 --- a/makefile_template.erb +++ /dev/null @@ -1,9 +0,0 @@ -ALL: slides.pdf slides_with_notes.pdf - -slides.pdf: slides.tex <%= deck_files.join " " %> - pdflatex -draftmode $< - pdflatex $< - -slides_with_notes.pdf: slides_with_notes.tex <%= deck_files.join " " %> - pdflatex -draftmode $< - pdflatex $< From 81dca711965d2c2e8978eb90f40d6daa7e915709 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 18:57:23 +0200 Subject: [PATCH 02/25] Update image paths --- content/alternate/alternate.tex | 18 ++++++++--------- content/ccc/ccc_bundesweit.tex | 6 +++--- content/ccc/ccc_lokal.tex | 2 +- content/firefox/firefox_plugins.tex | 12 +++++------ content/geldfrei/geldfrei.tex | 4 ++-- content/geraetesicherheit/app_permissions.tex | 2 +- .../geraetesicherheit/foss_programme_apps.tex | 14 ++++++------- .../unerwuenschte_funktionalitaet.tex | 4 ++-- content/internet/kollektive.tex | 2 +- content/internet/kommunikationsmodelle.tex | 4 ++-- content/internet/server_kabel_router.tex | 12 +++++------ content/internet/tor.tex | 12 +++++------ content/metadaten/alternative_dienste.tex | 10 +++++----- content/metadaten/antitracking.tex | 10 +++++----- content/metadaten/contacts.tex | 2 +- content/metadaten/location_heatmap.tex | 4 ++-- content/metadaten/nextcloud.tex | 12 +++++------ content/metadaten/nextcloud_weniger.tex | 4 ++-- .../metadaten/social-media-fingerprint.tex | 2 +- content/metadaten/tracking.tex | 4 ++-- content/metadaten/vds.tex | 2 +- content/metadaten/zeitstempel.tex | 6 +++--- content/motivation/freesoftware.tex | 14 ++++++------- content/motivation/stasi_vs_nsa.tex | 4 ++-- .../geschaeftsmodelleraten.tex | 2 +- content/soziale_netzwerke/ocean_modell.tex | 4 ++-- content/tracking/browser_fingerprinting.tex | 2 +- content/tracking/tracking.tex | 2 +- content/verschluesselung/e2e.tex | 20 +++++++++---------- content/verschluesselung/https_everywhere.tex | 2 +- content/verschluesselung/tls.tex | 6 +++--- content/wirtschaft/sharing-economy.tex | 2 +- 32 files changed, 103 insertions(+), 103 deletions(-) diff --git a/content/alternate/alternate.tex b/content/alternate/alternate.tex index 68b9ad7..b2f9c9d 100644 --- a/content/alternate/alternate.tex +++ b/content/alternate/alternate.tex @@ -49,7 +49,7 @@ Plattformübergreifende Synchronisierung von Dateien, Dokumenten, Kalendern, Kontakten, Notizen und News. \column{6cm} \begin{center} - \includegraphics[width=6cm]{../../img/owncloud-screenshot.jpg} + \includegraphics[width=6cm]{img/owncloud-screenshot.jpg} \par \end{center} \end{columns} @@ -58,28 +58,28 @@ Plattformübergreifende Synchronisierung von Dateien, Dokumenten, Kalendern, Kon %%% Folie 5 %%% \begin{frame}{Owncloud als Ersatz für Dropbox} \begin{center} - \includegraphics[width=9cm]{../../img/owncloud-screenshot.jpg} + \includegraphics[width=9cm]{img/owncloud-screenshot.jpg} \end{center} \end{frame} %%% Folie 6 %%% \begin{frame}{Owncloud als Ersatz für Google/Apple-Sync} \begin{center} - \includegraphics[width=9cm]{../../img/owncloud-calendar.png} + \includegraphics[width=9cm]{img/owncloud-calendar.png} \end{center} \end{frame} %%% Folie 7 %%% \begin{frame}{Owncloud als Ersatz für Google/Apple-Sync} \begin{center} - \includegraphics[width=9cm]{../../img/owncloud-contacts.png} + \includegraphics[width=9cm]{img/owncloud-contacts.png} \end{center} \end{frame} %%% Folie 8 %%% \begin{frame}{Owncloud als Ersatz für Google Docs} \begin{center} - \includegraphics[width=9cm]{../../img/owncloud-documents.png} + \includegraphics[width=9cm]{img/owncloud-documents.png} \end{center} \end{frame} @@ -91,10 +91,10 @@ Plattformübergreifende Synchronisierung von Dateien, Dokumenten, Kalendern, Kon Android-Appstore für freie Software \vspace{0.5cm} \textbf{iOS Open Source Apps}\\ - \includegraphics{../../img/fdroid.png} + \includegraphics{img/fdroid.png} \column{5cm} \begin{center} - \includegraphics[width=2cm]{../../img/F-Droid_Logo_2} + \includegraphics[width=2cm]{img/F-Droid_Logo_2} \par\end{center} \begin{center} \par @@ -117,9 +117,9 @@ Plattformübergreifende Synchronisierung von Dateien, Dokumenten, Kalendern, Kon \end{column} \begin{column}{5cm} \begin{center} - \includegraphics[width=0.5\textwidth]{../../img/startp_logo.png} + \includegraphics[width=0.5\textwidth]{img/startp_logo.png} \vspace{1cm} - \includegraphics[width=0.8\textwidth]{../../img/duckduckgo.png} + \includegraphics[width=0.8\textwidth]{img/duckduckgo.png} \end{center} \end{column} \end{columns} diff --git a/content/ccc/ccc_bundesweit.tex b/content/ccc/ccc_bundesweit.tex index 005688a..1818c9f 100644 --- a/content/ccc/ccc_bundesweit.tex +++ b/content/ccc/ccc_bundesweit.tex @@ -2,7 +2,7 @@ \frametitle{Chaos Computer Club} \begin{center} - \includegraphics[height=0.2\textheight]{../../img/chaosknoten.png} + \includegraphics[height=0.2\textheight]{img/chaosknoten.png} \end{center} \begin{itemize} \item<1-> Verein wurde 1981 gegründet (\url{https://ccc.de}) @@ -16,7 +16,7 @@ \begin{frame} \frametitle{Chaos Computer Club} \begin{figure} - \includegraphics[height=0.7\textheight]{../../img/fingerabdruck.jpg} + \includegraphics[height=0.7\textheight]{img/fingerabdruck.jpg} \end{figure} \end{frame} \note{Dies ist die erste von zwei Begebenheiten von der man den Chaos Computer Club, z.B. aus der Presse, kennen könnte. Üblicherweise fangen wir an zu fragen, was das abgebildete ist. Meist kommt als Antwort nur: ein Fingerabdruck. Tatsächlich ist es der Fingerabdruck von Herrn Schäuble, damals noch Innenminister. Der Fingerabdruck wurde bei einer Konferenz von einem Glas von Herrn Schäuble genommen und als Latexaufkleber für den Finger in der Datenschleuder, dem Magazin des CCC, verteilt. Es gibt einige bekannte Fälle in denen Mitglieder des CCC den Fingerabdruck von Herrn Schäuble im Reisepass haben, um damit zu zeigen, dass Fingerabdrücke kein geeignetes Identifikationsmerkmal darstellen und sich gegen die Abgabe der Fingerabdrücke zu widersetzen.} @@ -24,7 +24,7 @@ \begin{frame} \frametitle{Chaos Computer Club} \begin{figure} - \includegraphics[height=0.7\textheight]{../../img/trojaner.png} + \includegraphics[height=0.7\textheight]{img/trojaner.png} \end{figure} \end{frame} \note{Der Staatstrojaner ist die zweite bekannte Begebenheit. Dieser ist eine Schadsoftware die üblicherweise durch den Zoll auf den Computern von Verdächtigen auf einer Liste installiert wurde um später übers Internet erneut Zugriff auf das Gerät zu haben. Der CCC hat hier gezeigt, dass der Trojaner sehr viel mehr konnte als er verfassungsgemäß dürfte und hat damit den weiteren Einsatz unterbunden. Es ist bis heute umstritten, ob ein verfassungsgemäßer Einsatz von Trojanern überhaupt möglich ist.} diff --git a/content/ccc/ccc_lokal.tex b/content/ccc/ccc_lokal.tex index a378db3..45b6776 100644 --- a/content/ccc/ccc_lokal.tex +++ b/content/ccc/ccc_lokal.tex @@ -2,7 +2,7 @@ \frametitle{Chaos Computer Club} \begin{center} - \includegraphics[height=0.1\textheight]{../../img/c3d2_logo.png} + \includegraphics[height=0.1\textheight]{img/c3d2_logo.png} \end{center} \begin{itemize} \item<1-> Chaos Computer Club Dresden (\url{https://c3d2.de/}) diff --git a/content/firefox/firefox_plugins.tex b/content/firefox/firefox_plugins.tex index c507c2d..c298f84 100644 --- a/content/firefox/firefox_plugins.tex +++ b/content/firefox/firefox_plugins.tex @@ -2,7 +2,7 @@ %%% Folie 1 %%% \begin{frame} \frametitle{Firefox Add-ons} - \includegraphics{../../img/plugins.png} + \includegraphics{img/plugins.png} \begin{itemize} \item Better Privacy \item HTTPS Everywhere @@ -15,29 +15,29 @@ %%% Folie 2 %%% \begin{frame} \frametitle{Better Privacy} - \includegraphics[height=0.7\textheight]{../../img/better_privacy.png} + \includegraphics[height=0.7\textheight]{img/better_privacy.png} \end{frame} %%% Folie 3 %%% \begin{frame} \frametitle{HTTPS Everywhere} - \includegraphics[height=0.7\textheight]{../../img/https_everywhere.png} + \includegraphics[height=0.7\textheight]{img/https_everywhere.png} \end{frame} %%% Folie 4 %%% \begin{frame} \frametitle{NoScript} - \includegraphics[height=0.7\textheight]{../../img/noscript.png} + \includegraphics[height=0.7\textheight]{img/noscript.png} \end{frame} %%% Folie 5 %%% \begin{frame} \frametitle{uBlock Origin} - \includegraphics[height=0.7\textheight]{../../img/ublock-edge-extension.png} + \includegraphics[height=0.7\textheight]{img/ublock-edge-extension.png} \end{frame} %%% Folie 6 %%% \begin{frame} \frametitle{Lightbeam} - \includegraphics[height=0.7\textheight]{../../img/lightbeam.png} + \includegraphics[height=0.7\textheight]{img/lightbeam.png} \end{frame} diff --git a/content/geldfrei/geldfrei.tex b/content/geldfrei/geldfrei.tex index e28640d..879cbea 100644 --- a/content/geldfrei/geldfrei.tex +++ b/content/geldfrei/geldfrei.tex @@ -20,7 +20,7 @@ Eine Utopie für die meisten, aber eine Anregung zur Kreativität \frametitle{Minimalismus} \begin{figure} - \includegraphics[height=0.7\textheight]{../../img/icecoldminimalism.jpg} + \includegraphics[height=0.7\textheight]{img/icecoldminimalism.jpg} \caption[Needs a cusion! by Craig Sunter]{\href{https://flic.kr/p/nT2jEf}{{Needs a cusion!}, Craig Sunter, CC BY-ND 2.0}} \end{figure} \end{frame} @@ -35,7 +35,7 @@ Eine Utopie für die meisten, aber eine Anregung zur Kreativität \frametitle{Foodsharing} \begin{figure} - \includegraphics[width=0.9\textwidth]{../../img/foodsharing-cut.jpg} + \includegraphics[width=0.9\textwidth]{img/foodsharing-cut.jpg} \caption[Foodsharing by Oliver Hallmann, Ausschnitt]{\href{https://flic.kr/p/kCmbVx}{{Foodsharing: Kochbar - Minden}, Oliver Hallmann, CC BY 2.0}} \end{figure} diff --git a/content/geraetesicherheit/app_permissions.tex b/content/geraetesicherheit/app_permissions.tex index da35513..c3391b8 100644 --- a/content/geraetesicherheit/app_permissions.tex +++ b/content/geraetesicherheit/app_permissions.tex @@ -18,7 +18,7 @@ \column{5cm} \begin{center} - \includegraphics[width=3.5cm]{../../img/permissions-android.png} + \includegraphics[width=3.5cm]{img/permissions-android.png} \par\end{center} \end{columns} \end{frame} diff --git a/content/geraetesicherheit/foss_programme_apps.tex b/content/geraetesicherheit/foss_programme_apps.tex index 55a165e..4096d12 100644 --- a/content/geraetesicherheit/foss_programme_apps.tex +++ b/content/geraetesicherheit/foss_programme_apps.tex @@ -3,19 +3,19 @@ \begin{columns} \begin{column}{5cm} \begin{center} - \includegraphics[height=0.2\textheight]{../../img/firefox.png} \\ + \includegraphics[height=0.2\textheight]{img/firefox.png} \\ Firefox \\ \vspace{0.1\textheight} - \includegraphics[height=0.2\textheight]{../../img/libreoffice.jpg}\\ + \includegraphics[height=0.2\textheight]{img/libreoffice.jpg}\\ LibreOffice \end{center} \end{column} \begin{column}{5cm} \begin{center} - \includegraphics[height=0.2\textheight]{../../img/thunderbird.png} \\ + \includegraphics[height=0.2\textheight]{img/thunderbird.png} \\ Thunderbird \\ \vspace{0.1\textheight} - \includegraphics[height=0.2\textheight]{../../img/vlc.png}\\ + \includegraphics[height=0.2\textheight]{img/vlc.png}\\ VLC Media Player \end{center} \end{column} @@ -39,7 +39,7 @@ \column{5cm} \begin{center} - \includegraphics[width=2cm]{../../img/F-Droid_Logo_2} + \includegraphics[width=2cm]{img/F-Droid_Logo_2} \par\end{center} \begin{center} \par\end{center} @@ -53,13 +53,13 @@ \column{6.5cm} \begin{center} - \includegraphics[height=6cm]{../../img/fdroid1.png} + \includegraphics[height=6cm]{img/fdroid1.png} \par\end{center} \column{5cm} \begin{center} - \includegraphics[height=6cm]{../../img/fdroid2.png} + \includegraphics[height=6cm]{img/fdroid2.png} \par\end{center} \end{columns} \end{frame} diff --git a/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex b/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex index 88e6746..0d0921c 100644 --- a/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex +++ b/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex @@ -1,7 +1,7 @@ \begin{frame} \frametitle{Unerwünschte Funktionalität} \begin{center} - \includegraphics[width=0.7\textwidth]{../../img/windows10.png} + \includegraphics[width=0.7\textwidth]{img/windows10.png} \end{center} \end{frame} @@ -10,7 +10,7 @@ \begin{frame} \frametitle{Unerwünschte Funktionalität} \begin{center} - \includegraphics[width=7cm]{../../img/backdoor-apps} + \includegraphics[width=7cm]{img/backdoor-apps} \par\end{center} \end{frame} diff --git a/content/internet/kollektive.tex b/content/internet/kollektive.tex index 91cd358..d13774b 100644 --- a/content/internet/kollektive.tex +++ b/content/internet/kollektive.tex @@ -27,7 +27,7 @@ \frametitle{Experimental living} \begin{figure} - \includegraphics[height=0.2\textheight]{../../img/Wohnhaeuser_PHV_cut.jpg} + \includegraphics[height=0.2\textheight]{img/Wohnhaeuser_PHV_cut.jpg} \caption[Blick von Norden auf PHV, Ausschnitt]{\href{https://de.wikipedia.org/wiki/Datei:Wohnh\%C3\%A4user_PHV.JPG}{User:4028mdk09, CC BY-SA 3.0}} \end{figure} diff --git a/content/internet/kommunikationsmodelle.tex b/content/internet/kommunikationsmodelle.tex index 1aac21f..4e1b64b 100644 --- a/content/internet/kommunikationsmodelle.tex +++ b/content/internet/kommunikationsmodelle.tex @@ -2,7 +2,7 @@ \frametitle{Wie kommunizieren wir im Internet?} \begin{center} - \includegraphics[height=5cm]{../../img/c-s.png} + \includegraphics[height=5cm]{img/c-s.png} \end{center} \end{frame} \note{Stark vereinfacht kommunizieren zwei Internetnutzer, die sich eine Nachricht - beispielsweise über einen Messenger oder ein soziales Netzwerk - zusenden, indem der Sender die Nachrichten durchs Internet an einen Server schickt und dieser sie an den Empfänger weiterleitet. Ein Server ist ein Computer, der 24/7 angeschaltet ist und immer unter der selben Adresse im Internet zu finden ist.} @@ -10,7 +10,7 @@ \begin{frame} \frametitle{Föderation} \begin{center} - \includegraphics[height=5cm]{../../img/fed.png} + \includegraphics[height=5cm]{img/fed.png} \end{center} \end{frame} diff --git a/content/internet/server_kabel_router.tex b/content/internet/server_kabel_router.tex index 7ac92b0..9e628d3 100644 --- a/content/internet/server_kabel_router.tex +++ b/content/internet/server_kabel_router.tex @@ -1,7 +1,7 @@ \begin{frame} \frametitle{Server im Rechenzentrum} \begin{center} - \includegraphics[height=5cm]{../../img/data_center.jpg} + \includegraphics[height=5cm]{img/data_center.jpg} \end{center} \end{frame} @@ -10,7 +10,7 @@ \begin{frame} \frametitle{Traceroute Le Monde} \begin{center} - \includegraphics[height=5cm]{../../img/traceroute.png} + \includegraphics[height=5cm]{img/traceroute.png} \end{center} \end{frame} @@ -19,7 +19,7 @@ \begin{frame} \frametitle{Traceroute Facebook} \begin{center} - \includegraphics[height=5cm]{../../img/traceroute-facebook.png} + \includegraphics[height=5cm]{img/traceroute-facebook.png} \end{center} \end{frame} \note{Im Traceroute von Facebook sieht man, dass JEDE Anfrage an Facebook erstmal in die USA geht bevor sie dort feststellen, dass jemand aus Europa kommt und das dann auf die Server in Irland umleiten. Trotzdem hat der amerikanische Facebook-Zweig damit auch unsere Daten und nicht nur der datenschutzmäßig besser geschützte Teil in Europa.} @@ -27,7 +27,7 @@ \begin{frame} \frametitle{Internetknoten (Router)} \begin{center} - \includegraphics[height=5cm]{../../img/internet_cable_map.png} + \includegraphics[height=5cm]{img/internet_cable_map.png} \end{center} \end{frame} @@ -36,7 +36,7 @@ \begin{frame} \frametitle{Internetknoten (DE-CIX in Frankfurt)} \begin{center} - \includegraphics[height=5cm]{../../img/de_cix.jpg} + \includegraphics[height=5cm]{img/de_cix.jpg} \\{\small \href{https://de.wikipedia.org/wiki/DE-CIX\#/media/File:DE-CIX\_GERMANY\_-\_Switch\_Rack\_\%286218137120\%29.jpg}{Grafik}: \href{https://creativecommons.org/licenses/by-sa/2.0/}{\cc{by-sa} Stefan Funke}} \end{center} \end{frame} @@ -46,7 +46,7 @@ \begin{frame} \frametitle{Verbindungskabel} \begin{center} - \includegraphics[height=5cm]{../../img/seacable1.jpg} + \includegraphics[height=5cm]{img/seacable1.jpg} \end{center} \end{frame} diff --git a/content/internet/tor.tex b/content/internet/tor.tex index 1930941..0b63e6d 100644 --- a/content/internet/tor.tex +++ b/content/internet/tor.tex @@ -2,35 +2,35 @@ %%% Folie 1 %%% \begin{frame} \frametitle{Tor} - \includegraphics[width=0.5\textwidth, height=0.5\textheight]{../../img/tor.png} + \includegraphics[width=0.5\textwidth, height=0.5\textheight]{img/tor.png} \end{frame} %%% Folie 2 %%% \begin{frame} \frametitle{So funktioniert Tor} - \includegraphics[height=0.7\textheight]{../../img/tor1.png} + \includegraphics[height=0.7\textheight]{img/tor1.png} \end{frame} %%% Folie 3 %%% \begin{frame} \frametitle{Tor Bundle} - \includegraphics[width=1\textwidth, height=0.7\textheight]{../../img/tor_bundle.png} + \includegraphics[width=1\textwidth, height=0.7\textheight]{img/tor_bundle.png} \end{frame} %%% Folie 4 %%% \begin{frame} \frametitle{Tor Browser} - \includegraphics[width=1\textwidth, height=0.7\textheight]{../../img/tor_browser.jpg} + \includegraphics[width=1\textwidth, height=0.7\textheight]{img/tor_browser.jpg} \end{frame} %%% Folie 5 %%% \begin{frame} \frametitle{Orbot: Tor für Android} - \includegraphics[height=0.7\textheight]{../../img/orbot.png} + \includegraphics[height=0.7\textheight]{img/orbot.png} \end{frame} %%% Folie 6 %%% \begin{frame} \frametitle{Orbot} - \includegraphics[height=0.7\textheight]{../../img/orbot1.png} + \includegraphics[height=0.7\textheight]{img/orbot1.png} \end{frame} diff --git a/content/metadaten/alternative_dienste.tex b/content/metadaten/alternative_dienste.tex index 1139b86..f0a2145 100644 --- a/content/metadaten/alternative_dienste.tex +++ b/content/metadaten/alternative_dienste.tex @@ -13,8 +13,8 @@ \end{column} \begin{column}{5cm} \begin{center} - \includegraphics[width=0.5\textwidth]{../../img/startp_logo.png} - \includegraphics[width=0.8\textwidth]{../../img/duckduckgo.pdf} + \includegraphics[width=0.5\textwidth]{img/startp_logo.png} + \includegraphics[width=0.8\textwidth]{img/duckduckgo.pdf} \end{center} \end{column} \end{columns} @@ -37,8 +37,8 @@ \end{column} \begin{column}{5cm} \begin{center} - \includegraphics[width=0.5\textwidth]{../../img/osm.png} - \includegraphics[width=0.8\textwidth]{../../img/openrouteservice.png} + \includegraphics[width=0.5\textwidth]{img/osm.png} + \includegraphics[width=0.8\textwidth]{img/openrouteservice.png} \end{center} \end{column} \end{columns} @@ -49,7 +49,7 @@ \begin{frame} \frametitle{Alternative Kartendienste} \begin{center} - \includegraphics[height=6cm]{../../img/osmand.png} + \includegraphics[height=6cm]{img/osmand.png} \end{center} \end{frame} diff --git a/content/metadaten/antitracking.tex b/content/metadaten/antitracking.tex index e1696f9..a7af6a2 100644 --- a/content/metadaten/antitracking.tex +++ b/content/metadaten/antitracking.tex @@ -2,7 +2,7 @@ \frametitle{Disconnect, Privacy Badger (EFF), Ghostery} \begin{center} - \includegraphics[height=0.7\textheight]{../../img/disconnectme.jpg} + \includegraphics[height=0.7\textheight]{img/disconnectme.jpg} \end{center} \end{frame} \note{Auf dem PC und Laptop ist das vorgehen gegen Tracking leicht. Es gibt Addons für Chrome, Firefox etc.\ die Webseiten die Kommunikation mit Trackern einfach verbieten. Disconnect und Privacy Badger sind dabei Open Source und sollten wenn möglich dem bekannteren Ghostery vorgezogen werden.} @@ -11,7 +11,7 @@ \frametitle{Android: Antitracking im Firefox Privatmodus} \begin{center} - \includegraphics[height=0.7\textheight]{../../img/ff_antitrack.png} + \includegraphics[height=0.7\textheight]{img/ff_antitrack.png} \textbf{Installation für Firefox auf Android}\\ Firefox-Menü -> Extras -> Add-ons -> Alle Firefox-Addons ansehen -> nach Tracking suchen -> "Enable Tracking Protection" installieren. @@ -30,7 +30,7 @@ \column{5cm} \begin{center} - \includegraphics[width=3.5cm]{../../img/firefox-mobil-antitracking.png} + \includegraphics[width=3.5cm]{img/firefox-mobil-antitracking.png} \par\end{center} \end{columns} \end{frame} @@ -40,7 +40,7 @@ \frametitle{Antitracking Browser für iOS: Firefox Klar} \begin{center} - \includegraphics[height=0.5\textheight]{../../img/firefox-klar.jpg} + \includegraphics[height=0.5\textheight]{img/firefox-klar.jpg} \end{center} \end{frame} \note{Blockiert Werbung und verhindert Tracking!} @@ -60,7 +60,7 @@ \column{5cm} \begin{center} - \includegraphics[width=3.5cm]{../../img/google-adid.png} + \includegraphics[width=3.5cm]{img/google-adid.png} \par\end{center} \end{columns} \end{frame} diff --git a/content/metadaten/contacts.tex b/content/metadaten/contacts.tex index 44d5772..6af67eb 100644 --- a/content/metadaten/contacts.tex +++ b/content/metadaten/contacts.tex @@ -1,6 +1,6 @@ \begin{frame} \frametitle{Soziale Kontakte} \begin{center} - \includegraphics[width=0.8\textwidth]{../../img/phone-contacts.jpg} + \includegraphics[width=0.8\textwidth]{img/phone-contacts.jpg} \end{center} \end{frame} diff --git a/content/metadaten/location_heatmap.tex b/content/metadaten/location_heatmap.tex index 693905f..8817a9c 100644 --- a/content/metadaten/location_heatmap.tex +++ b/content/metadaten/location_heatmap.tex @@ -1,8 +1,8 @@ \begin{frame} \frametitle{Google Takeout} \begin{center} - \includegraphics<1>[width=0.8\textwidth]{../../img/google_heat_1.png} - \includegraphics<2>[width=0.8\textwidth]{../../img/google_heat_2.png} + \includegraphics<1>[width=0.8\textwidth]{img/google_heat_1.png} + \includegraphics<2>[width=0.8\textwidth]{img/google_heat_2.png} \end{center} \end{frame} \note{Dies ist eine sogenannte Heatmap, eine Hitzekarte, die uns die Informationen zeigt, die die Google Maps App im Hintergrund sammelt. Dies geschieht bei neueren Androidgeräten zu jedem Zeitpunkt, wenn das Gerät an ist (selbst wenn die App noch nicht geöffnet wurde). Generell zeigt die Karte wie detailliert man über das Leben eines Menschen nur anhand häufig besuchter Orte schließen kann. Über eine Kirche auf Religion, einen Arzt auf bestimmte Krankheiten, ein abweichendes Wegemuster auf eine Affäre oder eine neue Arbeit.} diff --git a/content/metadaten/nextcloud.tex b/content/metadaten/nextcloud.tex index 80f826e..652b6dd 100644 --- a/content/metadaten/nextcloud.tex +++ b/content/metadaten/nextcloud.tex @@ -1,36 +1,36 @@ \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud1.png} + \includegraphics[width=\textwidth]{img/nextcloud1.png} \end{center} \end{frame} \note{Nextcloud ist eine gute Alternative für Dropbox, Google Calender/Contacts, Apple iCloud und Google Docs. Es kann alle diese Dinge, ist dabei aber Open Source und man kann sich wie bei Email seinen Anbieter (und damit den Ort wo seine Daten liegen, z.B. bei einem deutschen Anbieter in Deutschland) aussuchen. Wenn man ein bisschen Bescheid weiß, kann man sich sogar eine kleine Nextcloudbox zu Hause hinstellen oder es auf einem eigenen Webspace installieren um noch mehr Kontrolle über seine Daten zu haben.} \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud2.png} + \includegraphics[width=\textwidth]{img/nextcloud2.png} \end{center} \end{frame} \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud3.png} + \includegraphics[width=\textwidth]{img/nextcloud3.png} \end{center} \end{frame} \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud4.png} + \includegraphics[width=\textwidth]{img/nextcloud4.png} \end{center} \end{frame} \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud5.png} + \includegraphics[width=\textwidth]{img/nextcloud5.png} \end{center} \end{frame} \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud6.png} + \includegraphics[width=\textwidth]{img/nextcloud6.png} \end{center} \end{frame} diff --git a/content/metadaten/nextcloud_weniger.tex b/content/metadaten/nextcloud_weniger.tex index 7942198..4f45494 100644 --- a/content/metadaten/nextcloud_weniger.tex +++ b/content/metadaten/nextcloud_weniger.tex @@ -1,12 +1,12 @@ \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud1.png} + \includegraphics[width=\textwidth]{img/nextcloud1.png} \end{center} \end{frame} \note{Nextcloud ist eine gute Alternative für Dropbox, Google Calender/Contacts, Apple iCloud und Google Docs. Es kann alle diese Dinge, ist dabei aber Open Source und man kann sich wie bei Email seinen Anbieter (und damit den Ort wo seine Daten liegen, z.B. bei einem deutschen Anbieter in Deutschland) aussuchen. Wenn man ein bisschen Bescheid weiß, kann man sich sogar eine kleine Nextcloudbox zu Hause hinstellen oder es auf einem eigenen Webspace installieren um noch mehr Kontrolle über seine Daten zu haben.} \begin{frame}{Nextcloud} \begin{center} - \includegraphics[width=\textwidth]{../../img/nextcloud6.png} + \includegraphics[width=\textwidth]{img/nextcloud6.png} \end{center} \end{frame} diff --git a/content/metadaten/social-media-fingerprint.tex b/content/metadaten/social-media-fingerprint.tex index 5324a7b..2508394 100644 --- a/content/metadaten/social-media-fingerprint.tex +++ b/content/metadaten/social-media-fingerprint.tex @@ -1,7 +1,7 @@ \begin{frame} \frametitle{Social Media Fingerprint} \begin{center} - \includegraphics<1>[width=0.7\textwidth]{../../img/social-media-fingerprint.png} + \includegraphics<1>[width=0.7\textwidth]{img/social-media-fingerprint.png} \note{Auf der Seite \url{https://robinlinus.github.io/socialmedia-leak/} kann man sehen, dass jede Seite wo bspw. ein Like-Button eingebunden ist, sehen kann ob jemand dort eingeloggt ist oder nicht. Auch andersherum funktioniert das: Wenn man bei Facebook eingeloggt ist, dass bekommt Facebook für jede Website die man besucht und die einen Like-Button hat mit, dass man sie besucht hat.} \end{center} \end{frame} diff --git a/content/metadaten/tracking.tex b/content/metadaten/tracking.tex index 70a9cdf..d0a9280 100644 --- a/content/metadaten/tracking.tex +++ b/content/metadaten/tracking.tex @@ -1,10 +1,10 @@ \begin{frame} \frametitle{Metadaten im WWW} \begin{center} - \includegraphics<1>[width=0.7\textwidth]{../../img/lightbeam_1.png} + \includegraphics<1>[width=0.7\textwidth]{img/lightbeam_1.png} \note{Ist es jemandem schonmal passiert, dass man sich etwas im Internet angeguckt hat und Tage und Wochen später noch Werbung auf ganz anderen Seiten für das gleiche gesehen hat? Das nennt sich Tracking und wird von vielen Firmen, u.a. Google und Facebook, gemacht um Leute auch auf anderen Webseiten verfolgen und ihre Aktivitäten mitschneiden zu können. } - \includegraphics<2>[width=0.7\textwidth]{../../img/lightbeam_2.png} + \includegraphics<2>[width=0.7\textwidth]{img/lightbeam_2.png} \note{Mit dem Addon Lightbeam für Firefox kann man sich anzeigen lassen, welche Tracker auf welchen Seiten eingebunden sind. An diesem Punkt bietet es sich an, das Plugin vorzuzeigen, es ggf. zu resetten und ein paar Websites aufzumachen, z.B. zeit.de, spon.de, google.de, facebook.com, web.de, gmx.de,... Besonders problematisch sind die Tracker (Dreiecke), die bei besonders vielen Websites (Kugeln) eingebunden sind.} \end{center} \end{frame} diff --git a/content/metadaten/vds.tex b/content/metadaten/vds.tex index aa90fa6..ccf1812 100644 --- a/content/metadaten/vds.tex +++ b/content/metadaten/vds.tex @@ -20,7 +20,7 @@ \begin{frame} \frametitle{Metadaten - VDS} - \includegraphics[height=0.7\textheight]{../../img/maltespitz.png} + \includegraphics[height=0.7\textheight]{img/maltespitz.png} \end{frame} \note{Malte Spitz ist im Vorstand der Grünen. Er hat sich, als es die Vorratsdatenspeicherung eine Weile gab, seine Daten von der Telekom erklagt und Zeit Online hat sie visualisiert. Man kann ihm über Monate weg ``folgen'', sieht wo er war, ggf. mit wem er sich getroffen hat, zu welchen Ärzten er gegangen ist und wann er auf Arbeit war.} diff --git a/content/metadaten/zeitstempel.tex b/content/metadaten/zeitstempel.tex index 58e4861..0f79de1 100644 --- a/content/metadaten/zeitstempel.tex +++ b/content/metadaten/zeitstempel.tex @@ -2,17 +2,17 @@ \frametitle{Zeitstempel} \begin{center} \only<1>{ - \includegraphics[width=0.9\textwidth]{../../img/punch_1.png} + \includegraphics[width=0.9\textwidth]{img/punch_1.png} \\ \hfill \small Alan, Microblogging } \only<2>{ - \includegraphics[width=0.9\textwidth]{../../img/punch_2.png} + \includegraphics[width=0.9\textwidth]{img/punch_2.png} \\ \hfill \small Bob, Microblogging } \only<3>{ - \includegraphics[width=0.9\textwidth]{../../img/punch_3.png} + \includegraphics[width=0.9\textwidth]{img/punch_3.png} \\ \hfill \small Charlie, Github } \end{center} diff --git a/content/motivation/freesoftware.tex b/content/motivation/freesoftware.tex index bb26c4f..be9221c 100644 --- a/content/motivation/freesoftware.tex +++ b/content/motivation/freesoftware.tex @@ -31,11 +31,11 @@ \column{7cm} \begin{center} - \includegraphics[width=4.5cm]{../../img/stallman} + \includegraphics[width=4.5cm]{img/stallman} \par\end{center} \begin{center} - \includegraphics[width=5cm]{../../img/logo-fsf} + \includegraphics[width=5cm]{img/logo-fsf} \par\end{center} \end{columns} \end{frame} @@ -45,19 +45,19 @@ \begin{columns} \begin{column}{5cm} \begin{center} - \includegraphics[height=0.2\textheight]{../../img/firefox.png} \\ + \includegraphics[height=0.2\textheight]{img/firefox.png} \\ Firefox \\ \vspace{0.1\textheight} - \includegraphics[height=0.2\textheight]{../../img/libreoffice.jpg}\\ + \includegraphics[height=0.2\textheight]{img/libreoffice.jpg}\\ LibreOffice \end{center} \end{column} \begin{column}{5cm} \begin{center} - \includegraphics[height=0.2\textheight]{../../img/thunderbird.png} \\ + \includegraphics[height=0.2\textheight]{img/thunderbird.png} \\ Thunderbird \\ \vspace{0.1\textheight} - \includegraphics[height=0.2\textheight]{../../img/vlc.png}\\ + \includegraphics[height=0.2\textheight]{img/vlc.png}\\ VLC Media Player \end{center} \end{column} @@ -79,7 +79,7 @@ \column{5cm} \begin{center} - \includegraphics[width=2cm]{../../img/F-Droid_Logo_2} + \includegraphics[width=2cm]{img/F-Droid_Logo_2} \par\end{center} \begin{center} \par\end{center} diff --git a/content/motivation/stasi_vs_nsa.tex b/content/motivation/stasi_vs_nsa.tex index 0ac91ec..d9449b0 100644 --- a/content/motivation/stasi_vs_nsa.tex +++ b/content/motivation/stasi_vs_nsa.tex @@ -11,7 +11,7 @@ \begin{frame} \frametitle{Stasi vs. NSA} \begin{center} - \includegraphics[height=0.7\textheight]{../../img/akten1.png} + \includegraphics[height=0.7\textheight]{img/akten1.png} \end{center} \end{frame} @@ -20,7 +20,7 @@ \begin{frame} \frametitle{Stasi vs. NSA} \begin{center} - \includegraphics[height=0.7\textheight]{../../img/akten2.png} + \includegraphics[height=0.7\textheight]{img/akten2.png} \end{center} \end{frame} diff --git a/content/soziale_netzwerke/geschaeftsmodelleraten.tex b/content/soziale_netzwerke/geschaeftsmodelleraten.tex index 75b6b6b..712f699 100644 --- a/content/soziale_netzwerke/geschaeftsmodelleraten.tex +++ b/content/soziale_netzwerke/geschaeftsmodelleraten.tex @@ -16,7 +16,7 @@ \begin{frame} \frametitle{Gesch"aftsmodelle} \begin{figure} - \includegraphics[height=0.7\textheight]{../../img/business_pigs.jpg} + \includegraphics[height=0.7\textheight]{img/business_pigs.jpg} \end{figure} \end{frame} diff --git a/content/soziale_netzwerke/ocean_modell.tex b/content/soziale_netzwerke/ocean_modell.tex index 47af82b..42001fc 100644 --- a/content/soziale_netzwerke/ocean_modell.tex +++ b/content/soziale_netzwerke/ocean_modell.tex @@ -1,14 +1,14 @@ \begin{frame} \frametitle{OCEAN Methode} \begin{center} - \includegraphics[width=0.8\textwidth]{../../img/ocean-modell.png} + \includegraphics[width=0.8\textwidth]{img/ocean-modell.png} \end{center} \end{frame} \begin{frame} \frametitle{OCEAN Studie} \begin{center} - \includegraphics[width=0.8\textwidth]{../../img/ocean-facebook-studie.png} + \includegraphics[width=0.8\textwidth]{img/ocean-facebook-studie.png} \end{center} \end{frame} diff --git a/content/tracking/browser_fingerprinting.tex b/content/tracking/browser_fingerprinting.tex index e1c1703..5e618e0 100644 --- a/content/tracking/browser_fingerprinting.tex +++ b/content/tracking/browser_fingerprinting.tex @@ -1,6 +1,6 @@ \begin{frame} \frametitle{Browser Fingerprint} - \includegraphics[height=0.7\textheight]{../../img/browser_fingerprint.png} + \includegraphics[height=0.7\textheight]{img/browser_fingerprint.png} \newline https://panopticlick.eff.org/ \end{frame} diff --git a/content/tracking/tracking.tex b/content/tracking/tracking.tex index 60c1e9d..35cb129 100644 --- a/content/tracking/tracking.tex +++ b/content/tracking/tracking.tex @@ -3,7 +3,7 @@ %%% Folie 1 %%% \begin{frame} \frametitle{Tracker} - \includegraphics[height=0.7\textheight]{../../img/lightbeam.png} + \includegraphics[height=0.7\textheight]{img/lightbeam.png} \end{frame} %%% Folie 2 %%% diff --git a/content/verschluesselung/e2e.tex b/content/verschluesselung/e2e.tex index ff09080..b7f8717 100644 --- a/content/verschluesselung/e2e.tex +++ b/content/verschluesselung/e2e.tex @@ -1,7 +1,7 @@ \begin{frame} \frametitle{Ende-zu-Ende-Verschlüsselung} \begin{center} - \includegraphics[height=0.8\textheight]{../../img/enc-e2e.png} + \includegraphics[height=0.8\textheight]{img/enc-e2e.png} \end{center} \end{frame} @@ -10,16 +10,16 @@ \begin{frame} \frametitle{Identität} \begin{center} - \includegraphics[height=6cm]{../../img/conversations-identity.jpg} + \includegraphics[height=6cm]{img/conversations-identity.jpg} \vspace{2cm} - \includegraphics[height=6cm]{../../img/signal-identity.jpg} + \includegraphics[height=6cm]{img/signal-identity.jpg} \end{center} \end{frame} \begin{frame} \frametitle{PGP (Pretty Good Privacy)} \begin{center} - \includegraphics[height=0.1\textheight]{../../img/gpg.png} + \includegraphics[height=0.1\textheight]{img/gpg.png} \end{center} \begin{itemize} \item<2->Hauptsächlich für Emailverschlüsselung genutzt @@ -34,7 +34,7 @@ \begin{frame} \frametitle{PGP:\@ Email-Verschlüsselung} \begin{center} - \includegraphics[height=0.5\textheight]{../../img/emailselfdefense.png} + \includegraphics[height=0.5\textheight]{img/emailselfdefense.png} \begin{itemize} \item https://emailselfdefense.fsf.org/de/ \end{itemize} @@ -53,7 +53,7 @@ \begin{frame} \frametitle{Signalprotokoll} \begin{center} - \includegraphics[height=0.2\textheight]{../../img/signal-logo.png} + \includegraphics[height=0.2\textheight]{img/signal-logo.png} \end{center} \begin{itemize} \item<2->Eingeführt vom Signal Messenger @@ -66,9 +66,9 @@ \begin{frame} \frametitle{Jabber: Conversations, ChatSecure} \begin{center} - \includegraphics[height=6cm]{../../img/conversations.jpg} + \includegraphics[height=6cm]{img/conversations.jpg} \hspace{0.5cm} - \includegraphics[height=6cm]{../../img/chatsecure.png} + \includegraphics[height=6cm]{img/chatsecure.png} \end{center} \url{https://xmpp.net/directory.php} \end{frame} @@ -78,9 +78,9 @@ \begin{frame} \frametitle{Signal} \begin{center} - \includegraphics[height=6cm]{../../img/signal-android.png} + \includegraphics[height=6cm]{img/signal-android.png} \hspace{0.5cm} - \includegraphics[height=6cm]{../../img/signal-ios.jpg} + \includegraphics[height=6cm]{img/signal-ios.jpg} \end{center} \end{frame} diff --git a/content/verschluesselung/https_everywhere.tex b/content/verschluesselung/https_everywhere.tex index 7e476d7..e56f26d 100644 --- a/content/verschluesselung/https_everywhere.tex +++ b/content/verschluesselung/https_everywhere.tex @@ -1,7 +1,7 @@ \begin{frame} \frametitle{HTTPS Everywhere} \begin{center} - \includegraphics[height=5cm]{../../img/https-everywhere.png} + \includegraphics[height=5cm]{img/https-everywhere.png} \end{center} \end{frame} diff --git a/content/verschluesselung/tls.tex b/content/verschluesselung/tls.tex index 724e643..ab11b38 100644 --- a/content/verschluesselung/tls.tex +++ b/content/verschluesselung/tls.tex @@ -1,7 +1,7 @@ \begin{frame} \frametitle{Transportwegverschlüsselung} \begin{center} - \includegraphics[height=0.8\textheight]{../../img/enc-transport.png} + \includegraphics[height=0.8\textheight]{img/enc-transport.png} \end{center} \end{frame} @@ -10,7 +10,7 @@ \begin{frame} \frametitle{SSL im Browser} \begin{center} - \includegraphics[height=0.7\textheight]{../../img/ssl_special.png} + \includegraphics[height=0.7\textheight]{img/ssl_special.png} \end{center} \end{frame} @@ -19,7 +19,7 @@ \begin{frame} \frametitle{Ungültiges Zertifikat} \begin{center} - \includegraphics[height=0.7\textheight]{../../img/ssl_badcert.png} + \includegraphics[height=0.7\textheight]{img/ssl_badcert.png} \end{center} \end{frame} diff --git a/content/wirtschaft/sharing-economy.tex b/content/wirtschaft/sharing-economy.tex index 899e378..b77c2a1 100644 --- a/content/wirtschaft/sharing-economy.tex +++ b/content/wirtschaft/sharing-economy.tex @@ -14,7 +14,7 @@ \frametitle{P2P Platform Model} \begin{figure} - \includegraphics[height=0.8\textheight]{../../img/platformbusinessmodelcanvas.png} + \includegraphics[height=0.8\textheight]{img/platformbusinessmodelcanvas.png} \caption[Platform Business Model Canvas]{\href{https://www.creatlr.com/template/um2yxrXADndCd8ftsGgY2/platform-business-model-canvas/}{{Platform Business Model Canvas}, Digital Ahead, \href{http://creativecommons.org/licenses/by-sa/4.0/}{CC BY-SA 4.0}}} \end{figure} \end{frame} From 99ffd2b9a62dba40025e2b70e3d6db1d7c44abee Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 18:57:58 +0200 Subject: [PATCH 03/25] Move presentations into one folder --- dates/.keep | 0 {dates => presentations}/16_06_22.yaml | 0 {dates => presentations}/16_12_13.yaml | 0 {dates => presentations}/17_05_20.yaml | 0 {dates => presentations}/18_02_06.yaml | 0 {decks => presentations}/alles-7-8kl-90min.tex | 0 {decks => presentations}/alles-7-8kl-90min.yaml | 0 {decks => presentations}/foej-workshop-180min.yaml | 0 {decks => presentations}/medinetzkongress.yaml | 0 {decks => presentations}/saferinternetday.yaml | 0 10 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dates/.keep rename {dates => presentations}/16_06_22.yaml (100%) rename {dates => presentations}/16_12_13.yaml (100%) rename {dates => presentations}/17_05_20.yaml (100%) rename {dates => presentations}/18_02_06.yaml (100%) rename {decks => presentations}/alles-7-8kl-90min.tex (100%) rename {decks => presentations}/alles-7-8kl-90min.yaml (100%) rename {decks => presentations}/foej-workshop-180min.yaml (100%) rename {decks => presentations}/medinetzkongress.yaml (100%) rename {decks => presentations}/saferinternetday.yaml (100%) diff --git a/dates/.keep b/dates/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/dates/16_06_22.yaml b/presentations/16_06_22.yaml similarity index 100% rename from dates/16_06_22.yaml rename to presentations/16_06_22.yaml diff --git a/dates/16_12_13.yaml b/presentations/16_12_13.yaml similarity index 100% rename from dates/16_12_13.yaml rename to presentations/16_12_13.yaml diff --git a/dates/17_05_20.yaml b/presentations/17_05_20.yaml similarity index 100% rename from dates/17_05_20.yaml rename to presentations/17_05_20.yaml diff --git a/dates/18_02_06.yaml b/presentations/18_02_06.yaml similarity index 100% rename from dates/18_02_06.yaml rename to presentations/18_02_06.yaml diff --git a/decks/alles-7-8kl-90min.tex b/presentations/alles-7-8kl-90min.tex similarity index 100% rename from decks/alles-7-8kl-90min.tex rename to presentations/alles-7-8kl-90min.tex diff --git a/decks/alles-7-8kl-90min.yaml b/presentations/alles-7-8kl-90min.yaml similarity index 100% rename from decks/alles-7-8kl-90min.yaml rename to presentations/alles-7-8kl-90min.yaml diff --git a/decks/foej-workshop-180min.yaml b/presentations/foej-workshop-180min.yaml similarity index 100% rename from decks/foej-workshop-180min.yaml rename to presentations/foej-workshop-180min.yaml diff --git a/decks/medinetzkongress.yaml b/presentations/medinetzkongress.yaml similarity index 100% rename from decks/medinetzkongress.yaml rename to presentations/medinetzkongress.yaml diff --git a/decks/saferinternetday.yaml b/presentations/saferinternetday.yaml similarity index 100% rename from decks/saferinternetday.yaml rename to presentations/saferinternetday.yaml From b77b97a9933478ce88ae5f3adf24c52d50496751 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 18:58:19 +0200 Subject: [PATCH 04/25] Convert one example presentation into pure LaTeX --- cms.cls | 46 +++++++++++++++++++++++++++++ presentations/medinetzkongress.tex | 43 +++++++++++++++++++++++++++ presentations/medinetzkongress.yaml | 27 ----------------- 3 files changed, 89 insertions(+), 27 deletions(-) create mode 100644 cms.cls create mode 100644 presentations/medinetzkongress.tex delete mode 100644 presentations/medinetzkongress.yaml diff --git a/cms.cls b/cms.cls new file mode 100644 index 0000000..b0ea4f0 --- /dev/null +++ b/cms.cls @@ -0,0 +1,46 @@ +\NeedsTeXFormat{LaTeX2e}[1994/12/01] +\ProvidesClass{cms}[2018/08/07 v1.00 Documentclass for CmS Presentations] + +\RequirePackage{etoolbox} + +\newbool{notes} +\boolfalse{notes} +\DeclareOption{notes}{\booltrue{notes}} + +\DeclareOption*{\PassOptionsToClass{\CurrentOption}{beamer}} + +\ProcessOptions\relax + +\LoadClass[12pt,xcolor={svgnames,table}]{beamer} + +\RequirePackage{graphicx} +\RequirePackage[ngerman]{babel} +\RequirePackage[T1]{fontenc} +\RequirePackage[utf8]{inputenc} +\RequirePackage{tikz} +\RequirePackage{pgfpages} +\RequirePackage{csquotes} +\RequirePackage{comment} +\RequirePackage{ifthen} +\RequirePackage{textcomp} +\RequirePackage{hyperref} +\RequirePackage{media9} + +\usetheme{Darmstadt} +\setbeamertemplate{footline}[frame number] + +\pgfdeclareimage[height=.6cm]{c3d2logo}{./img/c3d2.pdf} + +\pgfdeclarelayer{foreground} +\pgfsetlayers{main,foreground} +\logo{\pgfputat{\pgfxy(-1,0)}{\pgfbox[center,base]{\pgfuseimage{c3d2logo}}}} + +\ifbool{notes}{ + \setbeameroption{show notes on second screen = right}}{} + +\newcommand{\license}[2][]{\\#2\ifthenelse{\equal{#1}{}}{}{\\\scriptsize\url{#1}}} +\newcommand{\cc}[1]{\includegraphics[height=4mm]{img/#1.png}\hspace{1mm}} + +\newcommand{\includedeck}[1]{\include{content/#1}} + +\AfterBeginDocument{\maketitle} diff --git a/presentations/medinetzkongress.tex b/presentations/medinetzkongress.tex new file mode 100644 index 0000000..6c56657 --- /dev/null +++ b/presentations/medinetzkongress.tex @@ -0,0 +1,43 @@ +\documentclass{cms} +\title{Einführung in sichere Kommunikation} +\author{Marius Melzer und Reiner Lübeck} +\date{20.05.2017} + +\begin{document} + +\section{Einleitung} + +\includedeck{ccc/ccc_bundesweit} +\includedeck{ccc/ccc_lokal} + +\section{Internet} + +\includedeck{internet/kommunikationsmodelle} +\includedeck{internet/server_kabel_router} + +\section{Verschlüsselung} + +\includedeck{verschluesselung/tls} +\includedeck{verschluesselung/https_everywhere} +\includedeck{verschluesselung/e2e} +\includedeck{verschluesselung/messenger_vergleich} + +\section{Metadaten} + +\includedeck{metadaten/location_heatmap} +\includedeck{metadaten/zeitstempel} +\includedeck{metadaten/contacts} + +\section{Dezentralisierung} + +\includedeck{metadaten/nextcloud} + +\section{Verhalten} + +\includedeck{verhalten/passwoerter} + +\section{Fazit} + +\includedeck{fazit/medinetzkongress} + +\end{document} diff --git a/presentations/medinetzkongress.yaml b/presentations/medinetzkongress.yaml deleted file mode 100644 index 0cffcd4..0000000 --- a/presentations/medinetzkongress.yaml +++ /dev/null @@ -1,27 +0,0 @@ -Einleitung: - - ccc/ccc_bundesweit.tex - - ccc/ccc_lokal.tex - -Internet: - - internet/kommunikationsmodelle.tex - - internet/server_kabel_router.tex - -Verschlüsselung: - - verschluesselung/tls.tex - - verschluesselung/https_everywhere.tex - - verschluesselung/e2e.tex - - verschluesselung/messenger_vergleich.tex - -Metadaten: - - metadaten/location_heatmap.tex - - metadaten/zeitstempel.tex - - metadaten/contacts.tex - -Dezentralisierung: - - metadaten/nextcloud.tex - -Verhalten: - - verhalten/passwoerter.tex - -Fazit: - - fazit/medinetzkongress.tex From d2c5411617ee77c011a04bfeabaeab7044de90c6 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 18:59:07 +0200 Subject: [PATCH 05/25] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 4a3f45b..a99e160 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ dates/* !dates/*.yaml decks/* !decks/*.yaml +*.aux +*.log From ea3eca96b9aab9d0e267a03c9ad0fa4c3ae86fc4 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 19:10:59 +0200 Subject: [PATCH 06/25] Restructuring --- cms.cls => presentations/cms.cls | 0 .../content}/alternate/alternate.tex | 0 .../content}/ccc/ccc_bundesweit.tex | 0 .../content}/ccc/ccc_lokal.tex | 0 .../content}/fazit/alles-7-8kl-90min.tex | 0 .../content}/fazit/medinetzkongress.tex | 0 .../content}/firefox/firefox_plugins.tex | 0 .../content}/geldfrei/geldfrei.tex | 0 .../content}/geraetesicherheit/app_permissions.tex | 0 .../geraetesicherheit/foss_programme_apps.tex | 0 .../geraetesicherheit/schutzmoeglichkeiten.tex | 0 .../unerwuenschte_funktionalitaet.tex | 0 {content => presentations/content}/gruppen/fsfw.tex | 0 .../content}/internet/kollektive.tex | 0 .../content}/internet/kommunikationsmodelle.tex | 0 .../content}/internet/server_kabel_router.tex | 0 {content => presentations/content}/internet/tor.tex | 0 .../content}/metadaten/alternative_dienste.tex | 0 .../content}/metadaten/antitracking.tex | 0 .../content}/metadaten/contacts.tex | 0 .../content}/metadaten/location_heatmap.tex | 0 .../content}/metadaten/nextcloud.tex | 0 .../content}/metadaten/nextcloud_weniger.tex | 0 .../content}/metadaten/social-media-fingerprint.tex | 0 .../content}/metadaten/tracking.tex | 0 .../content}/metadaten/vds.tex | 0 .../content}/metadaten/zeitstempel.tex | 0 .../content}/motivation/freesoftware.tex | 0 .../content}/motivation/stasi_vs_nsa.tex | 0 .../soziale_netzwerke/geschaeftsmodelleraten.tex | 0 .../content}/soziale_netzwerke/ocean_modell.tex | 0 .../content}/soziale_netzwerke/umfrage.tex | 0 .../content}/soziale_netzwerke/umgangsformen.tex | 0 .../content}/tracking/browser_fingerprinting.tex | 0 .../content}/tracking/tracking.tex | 0 .../content}/verhalten/datensparsamkeit.tex | 0 .../content}/verhalten/passwoerter.tex | 0 .../content}/verschluesselung/e2e.tex | 0 .../content}/verschluesselung/https_everywhere.tex | 0 .../verschluesselung/messenger_vergleich.tex | 0 .../content}/verschluesselung/tls.tex | 0 .../content}/wirtschaft/sharing-economy.tex | 0 {img => presentations/img}/502400-64.png | Bin {img => presentations/img}/Beta-badge.pdf | Bin {img => presentations/img}/Beta-badge.svg | 0 {img => presentations/img}/F-Droid_Logo_2.pdf | Bin {img => presentations/img}/F-Droid_Logo_2.svg | 0 {img => presentations/img}/Gnupg_logo.pdf | Bin {img => presentations/img}/Gnupg_logo.svg | 0 {img => presentations/img}/Internet_map_1024.jpg | Bin {img => presentations/img}/LibreOffice.pdf | Bin {img => presentations/img}/LibreOffice.svg | 0 .../img}/Mozilla_Thunderbird_3.png | Bin {img => presentations/img}/Replicant_logo_alpha.pdf | Bin {img => presentations/img}/Replicant_logo_alpha.svg | 0 {img => presentations/img}/TextSecure_Icon.png | Bin {img => presentations/img}/Tux.pdf | Bin {img => presentations/img}/Tux.svg | 0 {img => presentations/img}/Wohnhaeuser_PHV.jpg | Bin {img => presentations/img}/Wohnhaeuser_PHV_cut.jpg | Bin {img => presentations/img}/akten1.png | Bin {img => presentations/img}/akten2.png | Bin {img => presentations/img}/anonymous.jpg | Bin {img => presentations/img}/asym_encryption.png | Bin {img => presentations/img}/auth.png | Bin {img => presentations/img}/backdoor-android.png | Bin {img => presentations/img}/backdoor-apps.png | Bin {img => presentations/img}/backdoor-av.png | Bin {img => presentations/img}/backdoor-flashlight.png | Bin {img => presentations/img}/backdoor-ios.png | Bin {img => presentations/img}/backdoor-samsung.png | Bin {img => presentations/img}/backdoor-samsung2.png | Bin {img => presentations/img}/backdoor-windows.png | Bin {img => presentations/img}/backdoor-windows2.png | Bin {img => presentations/img}/backdoor_gb.png | Bin {img => presentations/img}/better_privacy.png | Bin {img => presentations/img}/bitmessagelogo.png | Bin {img => presentations/img}/bote.jpg | Bin {img => presentations/img}/bridge1.png | Bin {img => presentations/img}/bridge2.png | Bin {img => presentations/img}/browser_fingerprint.png | Bin {img => presentations/img}/business_pigs.jpg | Bin {img => presentations/img}/by-nc-nd.png | Bin {img => presentations/img}/by-nc-sa.png | Bin {img => presentations/img}/by-sa.png | Bin {img => presentations/img}/by.png | Bin {img => presentations/img}/c-s.png | Bin {img => presentations/img}/c3d2.pdf | 0 {img => presentations/img}/c3d2.svg | 0 {img => presentations/img}/c3d2_logo.png | Bin {img => presentations/img}/certificate.png | Bin {img => presentations/img}/chaosknoten.png | Bin {img => presentations/img}/chatsecure.png | Bin {img => presentations/img}/client-server-graph.png | Bin {img => presentations/img}/cms.png | Bin {img => presentations/img}/compilation-process.png | Bin .../img}/conversations-identity.jpg | Bin {img => presentations/img}/conversations.jpg | Bin {img => presentations/img}/conversations.png | Bin {img => presentations/img}/data_center.jpg | Bin {img => presentations/img}/daten.png | Bin {img => presentations/img}/de_cix.jpg | Bin .../img}/decentralise-all-the-things.jpg | Bin .../img}/digitale_selbstverteidigung.png | Bin {img => presentations/img}/direkt.png | Bin {img => presentations/img}/disconnect.png | Bin {img => presentations/img}/disconnectme.jpg | Bin {img => presentations/img}/duckduckgo.pdf | Bin {img => presentations/img}/duckduckgo.png | Bin {img => presentations/img}/duckduckgo.svg | 0 {img => presentations/img}/emailselfdefense.png | Bin {img => presentations/img}/enc-e2e.png | Bin {img => presentations/img}/enc-transport.png | Bin {img => presentations/img}/facebook_whatsapp.png | Bin {img => presentations/img}/fdroid.png | Bin {img => presentations/img}/fdroid1.png | Bin {img => presentations/img}/fdroid2.png | Bin {img => presentations/img}/fed-all.png | Bin {img => presentations/img}/fed-bad-guy.png | Bin {img => presentations/img}/fed-clients-comm.png | Bin {img => presentations/img}/fed-clients.png | Bin {img => presentations/img}/fed-end-to-end.png | Bin {img => presentations/img}/fed-none.png | Bin {img => presentations/img}/fed-social.png | Bin {img => presentations/img}/fed.png | Bin {img => presentations/img}/ff_antitrack.png | Bin {img => presentations/img}/fingerabdruck.jpg | Bin {img => presentations/img}/firefox-klar.jpg | Bin .../img}/firefox-mobil-antitracking.png | Bin {img => presentations/img}/firefox.png | Bin {img => presentations/img}/foodsharing-cut.jpg | Bin {img => presentations/img}/foodsharing.jpg | Bin {img => presentations/img}/formatstring.png | Bin {img => presentations/img}/gnome.png | Bin {img => presentations/img}/google-adid.png | Bin {img => presentations/img}/google_heat_1.png | Bin {img => presentations/img}/google_heat_2.png | Bin {img => presentations/img}/gpg.mp4 | Bin {img => presentations/img}/gpg.png | Bin {img => presentations/img}/gpgvideo.png | Bin {img => presentations/img}/heise-merkel.png | Bin {img => presentations/img}/heise_lavabit.png | Bin {img => presentations/img}/https-everywhere.png | Bin {img => presentations/img}/https_everywhere.png | Bin {img => presentations/img}/icecoldminimalism.jpg | Bin {img => presentations/img}/internet_cable_map.png | Bin {img => presentations/img}/internet_dog.jpg | Bin .../img}/internetmap-abhoeren-prism-ssl.pdf | Bin .../img}/internetmap-abhoeren-prism-ssl.svg | 0 .../img}/internetmap-abhoeren-prism.pdf | Bin .../img}/internetmap-abhoeren-prism.svg | 0 .../img}/internetmap-abhoeren-ssl.pdf | Bin .../img}/internetmap-abhoeren-ssl.svg | 0 .../img}/internetmap-abhoeren-tempora-prism.pdf | Bin .../img}/internetmap-abhoeren-tempora-prism.svg | 0 .../img}/internetmap-abhoeren-tempora.pdf | Bin .../img}/internetmap-abhoeren-tempora.svg | 0 .../img}/internetmap-abhoeren-tor.pdf | Bin .../img}/internetmap-abhoeren-tor.svg | 0 {img => presentations/img}/internetmap-abhoeren.pdf | Bin {img => presentations/img}/internetmap-abhoeren.svg | 0 {img => presentations/img}/jabber.png | Bin {img => presentations/img}/jim_verkaufen.png | Bin {img => presentations/img}/krypto.pdf | Bin {img => presentations/img}/krypto.png | Bin {img => presentations/img}/krypto.svg | 0 {img => presentations/img}/krypto_asymmetric.pdf | Bin {img => presentations/img}/krypto_asymmetric.svg | 0 {img => presentations/img}/krypto_symmetric.pdf | Bin {img => presentations/img}/krypto_symmetric.svg | 0 {img => presentations/img}/libreoffice.jpg | Bin {img => presentations/img}/lightbeam.jpg | Bin {img => presentations/img}/lightbeam.png | Bin {img => presentations/img}/lightbeam_1.png | Bin {img => presentations/img}/lightbeam_2.png | Bin {img => presentations/img}/logo-fsf.pdf | Bin {img => presentations/img}/logo-fsf.svg | 0 {img => presentations/img}/mail.pdf | Bin {img => presentations/img}/mail.svg | 0 {img => presentations/img}/maltespitz.png | Bin {img => presentations/img}/metadaten_studie.png | Bin {img => presentations/img}/networkgraph.png | Bin {img => presentations/img}/netzpolitik-verizon.png | Bin {img => presentations/img}/nextcloud1.png | Bin {img => presentations/img}/nextcloud2.png | Bin {img => presentations/img}/nextcloud3.png | Bin {img => presentations/img}/nextcloud4.png | Bin {img => presentations/img}/nextcloud5.png | Bin {img => presentations/img}/nextcloud6.png | Bin {img => presentations/img}/noscript.png | Bin .../img}/ocean-facebook-studie.png | Bin {img => presentations/img}/ocean-modell.png | Bin {img => presentations/img}/openrouteservice.png | Bin {img => presentations/img}/orbot.png | Bin {img => presentations/img}/orbot1.png | Bin {img => presentations/img}/osm.png | Bin {img => presentations/img}/osmand.png | Bin {img => presentations/img}/owncloud-calendar.png | Bin {img => presentations/img}/owncloud-contacts.png | Bin {img => presentations/img}/owncloud-documents.png | Bin {img => presentations/img}/owncloud-screenshot.jpg | Bin {img => presentations/img}/owncloud.png | Bin {img => presentations/img}/palava-tv.png | Bin {img => presentations/img}/palava.png | Bin {img => presentations/img}/pentabug.jpg | Bin {img => presentations/img}/permissions-android.png | Bin {img => presentations/img}/permissions.png | Bin {img => presentations/img}/phone-contacts.jpg | Bin .../img}/platformbusinessmodelcanvas.png | Bin {img => presentations/img}/plugins.png | Bin {img => presentations/img}/prism-break1.png | Bin {img => presentations/img}/prism-break2.png | Bin {img => presentations/img}/prism.jpg | Bin {img => presentations/img}/prism_netzpolitik.png | Bin {img => presentations/img}/punch_1.png | Bin {img => presentations/img}/punch_2.png | Bin {img => presentations/img}/punch_3.png | Bin {img => presentations/img}/sandstorm.png | Bin {img => presentations/img}/seacable1.jpg | Bin {img => presentations/img}/security-apps.png | Bin {img => presentations/img}/security-whatsapp.png | Bin {img => presentations/img}/signal-android.png | Bin {img => presentations/img}/signal-identity.jpg | Bin {img => presentations/img}/signal-ios.jpg | Bin {img => presentations/img}/signal-logo.png | Bin {img => presentations/img}/signal1.png | Bin {img => presentations/img}/signal2.png | Bin {img => presentations/img}/snowden.jpg | Bin .../img}/social-media-fingerprint.png | Bin {img => presentations/img}/socialgraph.jpg | Bin {img => presentations/img}/spiegel-tempora.png | Bin {img => presentations/img}/ssl_badcert.png | Bin {img => presentations/img}/ssl_special.png | Bin {img => presentations/img}/ssl_unverified.png | Bin {img => presentations/img}/ssl_verified.png | Bin {img => presentations/img}/stallman.jpg | Bin {img => presentations/img}/startp_logo.png | Bin {img => presentations/img}/stille_sms.png | Bin {img => presentations/img}/tagesschau-vds.png | Bin {img => presentations/img}/telekom_mail.png | Bin {img => presentations/img}/text_data_mining.jpg | Bin {img => presentations/img}/textsecure1.png | Bin {img => presentations/img}/textsecure2.png | Bin {img => presentations/img}/thunderbird.png | Bin {img => presentations/img}/tls.pdf | Bin {img => presentations/img}/tls.svg | 0 {img => presentations/img}/tor-banner.png | Bin {img => presentations/img}/tor-tuerkei.jpg | Bin {img => presentations/img}/tor.png | Bin {img => presentations/img}/tor1.png | Bin {img => presentations/img}/tor2.png | Bin {img => presentations/img}/tor3.png | Bin {img => presentations/img}/tor_browser.jpg | Bin {img => presentations/img}/tor_bundle.png | Bin {img => presentations/img}/tor_bundle.xcf | Bin {img => presentations/img}/torbrowser1.png | Bin {img => presentations/img}/torbrowser2.png | Bin {img => presentations/img}/torgermany.jpg | Bin {img => presentations/img}/torrorist.png | Bin {img => presentations/img}/torstinks.png | Bin {img => presentations/img}/traceroute-facebook.png | Bin {img => presentations/img}/traceroute.png | Bin {img => presentations/img}/trojaner.png | Bin .../img}/ublock-edge-extension.png | Bin {img => presentations/img}/vidalia.png | Bin {img => presentations/img}/vlc.png | Bin {img => presentations/img}/weboftrust.png | Bin {img => presentations/img}/wekillpeople.jpg | Bin {img => presentations/img}/weknowwhatyouredoing.png | Bin {img => presentations/img}/windows10.png | Bin {img => presentations/img}/xmpp1.png | Bin {img => presentations/img}/zensur-guardian.jpg | Bin {img => presentations/img}/zensur.png | Bin {img => presentations/img}/zertifikate.png | Bin 274 files changed, 0 insertions(+), 0 deletions(-) rename cms.cls => presentations/cms.cls (100%) rename {content => presentations/content}/alternate/alternate.tex (100%) rename {content => presentations/content}/ccc/ccc_bundesweit.tex (100%) rename {content => presentations/content}/ccc/ccc_lokal.tex (100%) rename {content => presentations/content}/fazit/alles-7-8kl-90min.tex (100%) rename {content => presentations/content}/fazit/medinetzkongress.tex (100%) rename {content => presentations/content}/firefox/firefox_plugins.tex (100%) rename {content => presentations/content}/geldfrei/geldfrei.tex (100%) rename {content => presentations/content}/geraetesicherheit/app_permissions.tex (100%) rename {content => presentations/content}/geraetesicherheit/foss_programme_apps.tex (100%) rename {content => presentations/content}/geraetesicherheit/schutzmoeglichkeiten.tex (100%) rename {content => presentations/content}/geraetesicherheit/unerwuenschte_funktionalitaet.tex (100%) rename {content => presentations/content}/gruppen/fsfw.tex (100%) rename {content => presentations/content}/internet/kollektive.tex (100%) rename {content => presentations/content}/internet/kommunikationsmodelle.tex (100%) rename {content => presentations/content}/internet/server_kabel_router.tex (100%) rename {content => presentations/content}/internet/tor.tex (100%) rename {content => presentations/content}/metadaten/alternative_dienste.tex (100%) rename {content => presentations/content}/metadaten/antitracking.tex (100%) rename {content => presentations/content}/metadaten/contacts.tex (100%) rename {content => presentations/content}/metadaten/location_heatmap.tex (100%) rename {content => presentations/content}/metadaten/nextcloud.tex (100%) rename {content => presentations/content}/metadaten/nextcloud_weniger.tex (100%) rename {content => presentations/content}/metadaten/social-media-fingerprint.tex (100%) rename {content => presentations/content}/metadaten/tracking.tex (100%) rename {content => presentations/content}/metadaten/vds.tex (100%) rename {content => presentations/content}/metadaten/zeitstempel.tex (100%) rename {content => presentations/content}/motivation/freesoftware.tex (100%) rename {content => presentations/content}/motivation/stasi_vs_nsa.tex (100%) rename {content => presentations/content}/soziale_netzwerke/geschaeftsmodelleraten.tex (100%) rename {content => presentations/content}/soziale_netzwerke/ocean_modell.tex (100%) rename {content => presentations/content}/soziale_netzwerke/umfrage.tex (100%) rename {content => presentations/content}/soziale_netzwerke/umgangsformen.tex (100%) rename {content => presentations/content}/tracking/browser_fingerprinting.tex (100%) rename {content => presentations/content}/tracking/tracking.tex (100%) rename {content => presentations/content}/verhalten/datensparsamkeit.tex (100%) rename {content => presentations/content}/verhalten/passwoerter.tex (100%) rename {content => presentations/content}/verschluesselung/e2e.tex (100%) rename {content => presentations/content}/verschluesselung/https_everywhere.tex (100%) rename {content => presentations/content}/verschluesselung/messenger_vergleich.tex (100%) rename {content => presentations/content}/verschluesselung/tls.tex (100%) rename {content => presentations/content}/wirtschaft/sharing-economy.tex (100%) rename {img => presentations/img}/502400-64.png (100%) rename {img => presentations/img}/Beta-badge.pdf (100%) rename {img => presentations/img}/Beta-badge.svg (100%) rename {img => presentations/img}/F-Droid_Logo_2.pdf (100%) rename {img => presentations/img}/F-Droid_Logo_2.svg (100%) rename {img => presentations/img}/Gnupg_logo.pdf (100%) rename {img => presentations/img}/Gnupg_logo.svg (100%) rename {img => presentations/img}/Internet_map_1024.jpg (100%) rename {img => presentations/img}/LibreOffice.pdf (100%) rename {img => presentations/img}/LibreOffice.svg (100%) rename {img => presentations/img}/Mozilla_Thunderbird_3.png (100%) rename {img => presentations/img}/Replicant_logo_alpha.pdf (100%) rename {img => presentations/img}/Replicant_logo_alpha.svg (100%) rename {img => presentations/img}/TextSecure_Icon.png (100%) rename {img => presentations/img}/Tux.pdf (100%) rename {img => presentations/img}/Tux.svg (100%) rename {img => presentations/img}/Wohnhaeuser_PHV.jpg (100%) rename {img => presentations/img}/Wohnhaeuser_PHV_cut.jpg (100%) rename {img => presentations/img}/akten1.png (100%) rename {img => presentations/img}/akten2.png (100%) rename {img => presentations/img}/anonymous.jpg (100%) rename {img => presentations/img}/asym_encryption.png (100%) rename {img => presentations/img}/auth.png (100%) rename {img => presentations/img}/backdoor-android.png (100%) rename {img => presentations/img}/backdoor-apps.png (100%) rename {img => presentations/img}/backdoor-av.png (100%) rename {img => presentations/img}/backdoor-flashlight.png (100%) rename {img => presentations/img}/backdoor-ios.png (100%) rename {img => presentations/img}/backdoor-samsung.png (100%) rename {img => presentations/img}/backdoor-samsung2.png (100%) rename {img => presentations/img}/backdoor-windows.png (100%) rename {img => presentations/img}/backdoor-windows2.png (100%) rename {img => presentations/img}/backdoor_gb.png (100%) rename {img => presentations/img}/better_privacy.png (100%) rename {img => presentations/img}/bitmessagelogo.png (100%) rename {img => presentations/img}/bote.jpg (100%) rename {img => presentations/img}/bridge1.png (100%) rename {img => presentations/img}/bridge2.png (100%) rename {img => presentations/img}/browser_fingerprint.png (100%) rename {img => presentations/img}/business_pigs.jpg (100%) rename {img => presentations/img}/by-nc-nd.png (100%) rename {img => presentations/img}/by-nc-sa.png (100%) rename {img => presentations/img}/by-sa.png (100%) rename {img => presentations/img}/by.png (100%) rename {img => presentations/img}/c-s.png (100%) rename {img => presentations/img}/c3d2.pdf (100%) rename {img => presentations/img}/c3d2.svg (100%) rename {img => presentations/img}/c3d2_logo.png (100%) rename {img => presentations/img}/certificate.png (100%) rename {img => presentations/img}/chaosknoten.png (100%) rename {img => presentations/img}/chatsecure.png (100%) rename {img => presentations/img}/client-server-graph.png (100%) rename {img => presentations/img}/cms.png (100%) rename {img => presentations/img}/compilation-process.png (100%) rename {img => presentations/img}/conversations-identity.jpg (100%) rename {img => presentations/img}/conversations.jpg (100%) rename {img => presentations/img}/conversations.png (100%) rename {img => presentations/img}/data_center.jpg (100%) rename {img => presentations/img}/daten.png (100%) rename {img => presentations/img}/de_cix.jpg (100%) rename {img => presentations/img}/decentralise-all-the-things.jpg (100%) rename {img => presentations/img}/digitale_selbstverteidigung.png (100%) rename {img => presentations/img}/direkt.png (100%) rename {img => presentations/img}/disconnect.png (100%) rename {img => presentations/img}/disconnectme.jpg (100%) rename {img => presentations/img}/duckduckgo.pdf (100%) rename {img => presentations/img}/duckduckgo.png (100%) rename {img => presentations/img}/duckduckgo.svg (100%) rename {img => presentations/img}/emailselfdefense.png (100%) rename {img => presentations/img}/enc-e2e.png (100%) rename {img => presentations/img}/enc-transport.png (100%) rename {img => presentations/img}/facebook_whatsapp.png (100%) rename {img => presentations/img}/fdroid.png (100%) rename {img => presentations/img}/fdroid1.png (100%) rename {img => presentations/img}/fdroid2.png (100%) rename {img => presentations/img}/fed-all.png (100%) rename {img => presentations/img}/fed-bad-guy.png (100%) rename {img => presentations/img}/fed-clients-comm.png (100%) rename {img => presentations/img}/fed-clients.png (100%) rename {img => presentations/img}/fed-end-to-end.png (100%) rename {img => presentations/img}/fed-none.png (100%) rename {img => presentations/img}/fed-social.png (100%) rename {img => presentations/img}/fed.png (100%) rename {img => presentations/img}/ff_antitrack.png (100%) rename {img => presentations/img}/fingerabdruck.jpg (100%) rename {img => presentations/img}/firefox-klar.jpg (100%) rename {img => presentations/img}/firefox-mobil-antitracking.png (100%) rename {img => presentations/img}/firefox.png (100%) rename {img => presentations/img}/foodsharing-cut.jpg (100%) rename {img => presentations/img}/foodsharing.jpg (100%) rename {img => presentations/img}/formatstring.png (100%) rename {img => presentations/img}/gnome.png (100%) rename {img => presentations/img}/google-adid.png (100%) rename {img => presentations/img}/google_heat_1.png (100%) rename {img => presentations/img}/google_heat_2.png (100%) rename {img => presentations/img}/gpg.mp4 (100%) rename {img => presentations/img}/gpg.png (100%) rename {img => presentations/img}/gpgvideo.png (100%) rename {img => presentations/img}/heise-merkel.png (100%) rename {img => presentations/img}/heise_lavabit.png (100%) rename {img => presentations/img}/https-everywhere.png (100%) rename {img => presentations/img}/https_everywhere.png (100%) rename {img => presentations/img}/icecoldminimalism.jpg (100%) rename {img => presentations/img}/internet_cable_map.png (100%) rename {img => presentations/img}/internet_dog.jpg (100%) rename {img => presentations/img}/internetmap-abhoeren-prism-ssl.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren-prism-ssl.svg (100%) rename {img => presentations/img}/internetmap-abhoeren-prism.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren-prism.svg (100%) rename {img => presentations/img}/internetmap-abhoeren-ssl.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren-ssl.svg (100%) rename {img => presentations/img}/internetmap-abhoeren-tempora-prism.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren-tempora-prism.svg (100%) rename {img => presentations/img}/internetmap-abhoeren-tempora.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren-tempora.svg (100%) rename {img => presentations/img}/internetmap-abhoeren-tor.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren-tor.svg (100%) rename {img => presentations/img}/internetmap-abhoeren.pdf (100%) rename {img => presentations/img}/internetmap-abhoeren.svg (100%) rename {img => presentations/img}/jabber.png (100%) rename {img => presentations/img}/jim_verkaufen.png (100%) rename {img => presentations/img}/krypto.pdf (100%) rename {img => presentations/img}/krypto.png (100%) rename {img => presentations/img}/krypto.svg (100%) rename {img => presentations/img}/krypto_asymmetric.pdf (100%) rename {img => presentations/img}/krypto_asymmetric.svg (100%) rename {img => presentations/img}/krypto_symmetric.pdf (100%) rename {img => presentations/img}/krypto_symmetric.svg (100%) rename {img => presentations/img}/libreoffice.jpg (100%) rename {img => presentations/img}/lightbeam.jpg (100%) rename {img => presentations/img}/lightbeam.png (100%) rename {img => presentations/img}/lightbeam_1.png (100%) rename {img => presentations/img}/lightbeam_2.png (100%) rename {img => presentations/img}/logo-fsf.pdf (100%) rename {img => presentations/img}/logo-fsf.svg (100%) rename {img => presentations/img}/mail.pdf (100%) rename {img => presentations/img}/mail.svg (100%) rename {img => presentations/img}/maltespitz.png (100%) rename {img => presentations/img}/metadaten_studie.png (100%) rename {img => presentations/img}/networkgraph.png (100%) rename {img => presentations/img}/netzpolitik-verizon.png (100%) rename {img => presentations/img}/nextcloud1.png (100%) rename {img => presentations/img}/nextcloud2.png (100%) rename {img => presentations/img}/nextcloud3.png (100%) rename {img => presentations/img}/nextcloud4.png (100%) rename {img => presentations/img}/nextcloud5.png (100%) rename {img => presentations/img}/nextcloud6.png (100%) rename {img => presentations/img}/noscript.png (100%) rename {img => presentations/img}/ocean-facebook-studie.png (100%) rename {img => presentations/img}/ocean-modell.png (100%) rename {img => presentations/img}/openrouteservice.png (100%) rename {img => presentations/img}/orbot.png (100%) rename {img => presentations/img}/orbot1.png (100%) rename {img => presentations/img}/osm.png (100%) rename {img => presentations/img}/osmand.png (100%) rename {img => presentations/img}/owncloud-calendar.png (100%) rename {img => presentations/img}/owncloud-contacts.png (100%) rename {img => presentations/img}/owncloud-documents.png (100%) rename {img => presentations/img}/owncloud-screenshot.jpg (100%) rename {img => presentations/img}/owncloud.png (100%) rename {img => presentations/img}/palava-tv.png (100%) rename {img => presentations/img}/palava.png (100%) rename {img => presentations/img}/pentabug.jpg (100%) rename {img => presentations/img}/permissions-android.png (100%) rename {img => presentations/img}/permissions.png (100%) rename {img => presentations/img}/phone-contacts.jpg (100%) rename {img => presentations/img}/platformbusinessmodelcanvas.png (100%) rename {img => presentations/img}/plugins.png (100%) rename {img => presentations/img}/prism-break1.png (100%) rename {img => presentations/img}/prism-break2.png (100%) rename {img => presentations/img}/prism.jpg (100%) rename {img => presentations/img}/prism_netzpolitik.png (100%) rename {img => presentations/img}/punch_1.png (100%) rename {img => presentations/img}/punch_2.png (100%) rename {img => presentations/img}/punch_3.png (100%) rename {img => presentations/img}/sandstorm.png (100%) rename {img => presentations/img}/seacable1.jpg (100%) rename {img => presentations/img}/security-apps.png (100%) rename {img => presentations/img}/security-whatsapp.png (100%) rename {img => presentations/img}/signal-android.png (100%) rename {img => presentations/img}/signal-identity.jpg (100%) rename {img => presentations/img}/signal-ios.jpg (100%) rename {img => presentations/img}/signal-logo.png (100%) rename {img => presentations/img}/signal1.png (100%) rename {img => presentations/img}/signal2.png (100%) rename {img => presentations/img}/snowden.jpg (100%) rename {img => presentations/img}/social-media-fingerprint.png (100%) rename {img => presentations/img}/socialgraph.jpg (100%) rename {img => presentations/img}/spiegel-tempora.png (100%) rename {img => presentations/img}/ssl_badcert.png (100%) rename {img => presentations/img}/ssl_special.png (100%) rename {img => presentations/img}/ssl_unverified.png (100%) rename {img => presentations/img}/ssl_verified.png (100%) rename {img => presentations/img}/stallman.jpg (100%) rename {img => presentations/img}/startp_logo.png (100%) rename {img => presentations/img}/stille_sms.png (100%) rename {img => presentations/img}/tagesschau-vds.png (100%) rename {img => presentations/img}/telekom_mail.png (100%) rename {img => presentations/img}/text_data_mining.jpg (100%) rename {img => presentations/img}/textsecure1.png (100%) rename {img => presentations/img}/textsecure2.png (100%) rename {img => presentations/img}/thunderbird.png (100%) rename {img => presentations/img}/tls.pdf (100%) rename {img => presentations/img}/tls.svg (100%) rename {img => presentations/img}/tor-banner.png (100%) rename {img => presentations/img}/tor-tuerkei.jpg (100%) rename {img => presentations/img}/tor.png (100%) rename {img => presentations/img}/tor1.png (100%) rename {img => presentations/img}/tor2.png (100%) rename {img => presentations/img}/tor3.png (100%) rename {img => presentations/img}/tor_browser.jpg (100%) rename {img => presentations/img}/tor_bundle.png (100%) rename {img => presentations/img}/tor_bundle.xcf (100%) rename {img => presentations/img}/torbrowser1.png (100%) rename {img => presentations/img}/torbrowser2.png (100%) rename {img => presentations/img}/torgermany.jpg (100%) rename {img => presentations/img}/torrorist.png (100%) rename {img => presentations/img}/torstinks.png (100%) rename {img => presentations/img}/traceroute-facebook.png (100%) rename {img => presentations/img}/traceroute.png (100%) rename {img => presentations/img}/trojaner.png (100%) rename {img => presentations/img}/ublock-edge-extension.png (100%) rename {img => presentations/img}/vidalia.png (100%) rename {img => presentations/img}/vlc.png (100%) rename {img => presentations/img}/weboftrust.png (100%) rename {img => presentations/img}/wekillpeople.jpg (100%) rename {img => presentations/img}/weknowwhatyouredoing.png (100%) rename {img => presentations/img}/windows10.png (100%) rename {img => presentations/img}/xmpp1.png (100%) rename {img => presentations/img}/zensur-guardian.jpg (100%) rename {img => presentations/img}/zensur.png (100%) rename {img => presentations/img}/zertifikate.png (100%) diff --git a/cms.cls b/presentations/cms.cls similarity index 100% rename from cms.cls rename to presentations/cms.cls diff --git a/content/alternate/alternate.tex b/presentations/content/alternate/alternate.tex similarity index 100% rename from content/alternate/alternate.tex rename to presentations/content/alternate/alternate.tex diff --git a/content/ccc/ccc_bundesweit.tex b/presentations/content/ccc/ccc_bundesweit.tex similarity index 100% rename from content/ccc/ccc_bundesweit.tex rename to presentations/content/ccc/ccc_bundesweit.tex diff --git a/content/ccc/ccc_lokal.tex b/presentations/content/ccc/ccc_lokal.tex similarity index 100% rename from content/ccc/ccc_lokal.tex rename to presentations/content/ccc/ccc_lokal.tex diff --git a/content/fazit/alles-7-8kl-90min.tex b/presentations/content/fazit/alles-7-8kl-90min.tex similarity index 100% rename from content/fazit/alles-7-8kl-90min.tex rename to presentations/content/fazit/alles-7-8kl-90min.tex diff --git a/content/fazit/medinetzkongress.tex b/presentations/content/fazit/medinetzkongress.tex similarity index 100% rename from content/fazit/medinetzkongress.tex rename to presentations/content/fazit/medinetzkongress.tex diff --git a/content/firefox/firefox_plugins.tex b/presentations/content/firefox/firefox_plugins.tex similarity index 100% rename from content/firefox/firefox_plugins.tex rename to presentations/content/firefox/firefox_plugins.tex diff --git a/content/geldfrei/geldfrei.tex b/presentations/content/geldfrei/geldfrei.tex similarity index 100% rename from content/geldfrei/geldfrei.tex rename to presentations/content/geldfrei/geldfrei.tex diff --git a/content/geraetesicherheit/app_permissions.tex b/presentations/content/geraetesicherheit/app_permissions.tex similarity index 100% rename from content/geraetesicherheit/app_permissions.tex rename to presentations/content/geraetesicherheit/app_permissions.tex diff --git a/content/geraetesicherheit/foss_programme_apps.tex b/presentations/content/geraetesicherheit/foss_programme_apps.tex similarity index 100% rename from content/geraetesicherheit/foss_programme_apps.tex rename to presentations/content/geraetesicherheit/foss_programme_apps.tex diff --git a/content/geraetesicherheit/schutzmoeglichkeiten.tex b/presentations/content/geraetesicherheit/schutzmoeglichkeiten.tex similarity index 100% rename from content/geraetesicherheit/schutzmoeglichkeiten.tex rename to presentations/content/geraetesicherheit/schutzmoeglichkeiten.tex diff --git a/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex b/presentations/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex similarity index 100% rename from content/geraetesicherheit/unerwuenschte_funktionalitaet.tex rename to presentations/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex diff --git a/content/gruppen/fsfw.tex b/presentations/content/gruppen/fsfw.tex similarity index 100% rename from content/gruppen/fsfw.tex rename to presentations/content/gruppen/fsfw.tex diff --git a/content/internet/kollektive.tex b/presentations/content/internet/kollektive.tex similarity index 100% rename from content/internet/kollektive.tex rename to presentations/content/internet/kollektive.tex diff --git a/content/internet/kommunikationsmodelle.tex b/presentations/content/internet/kommunikationsmodelle.tex similarity index 100% rename from content/internet/kommunikationsmodelle.tex rename to presentations/content/internet/kommunikationsmodelle.tex diff --git a/content/internet/server_kabel_router.tex b/presentations/content/internet/server_kabel_router.tex similarity index 100% rename from content/internet/server_kabel_router.tex rename to presentations/content/internet/server_kabel_router.tex diff --git a/content/internet/tor.tex b/presentations/content/internet/tor.tex similarity index 100% rename from content/internet/tor.tex rename to presentations/content/internet/tor.tex diff --git a/content/metadaten/alternative_dienste.tex b/presentations/content/metadaten/alternative_dienste.tex similarity index 100% rename from content/metadaten/alternative_dienste.tex rename to presentations/content/metadaten/alternative_dienste.tex diff --git a/content/metadaten/antitracking.tex b/presentations/content/metadaten/antitracking.tex similarity index 100% rename from content/metadaten/antitracking.tex rename to presentations/content/metadaten/antitracking.tex diff --git a/content/metadaten/contacts.tex b/presentations/content/metadaten/contacts.tex similarity index 100% rename from content/metadaten/contacts.tex rename to presentations/content/metadaten/contacts.tex diff --git a/content/metadaten/location_heatmap.tex b/presentations/content/metadaten/location_heatmap.tex similarity index 100% rename from content/metadaten/location_heatmap.tex rename to presentations/content/metadaten/location_heatmap.tex diff --git a/content/metadaten/nextcloud.tex b/presentations/content/metadaten/nextcloud.tex similarity index 100% rename from content/metadaten/nextcloud.tex rename to presentations/content/metadaten/nextcloud.tex diff --git a/content/metadaten/nextcloud_weniger.tex b/presentations/content/metadaten/nextcloud_weniger.tex similarity index 100% rename from content/metadaten/nextcloud_weniger.tex rename to presentations/content/metadaten/nextcloud_weniger.tex diff --git a/content/metadaten/social-media-fingerprint.tex b/presentations/content/metadaten/social-media-fingerprint.tex similarity index 100% rename from content/metadaten/social-media-fingerprint.tex rename to presentations/content/metadaten/social-media-fingerprint.tex diff --git a/content/metadaten/tracking.tex b/presentations/content/metadaten/tracking.tex similarity index 100% rename from content/metadaten/tracking.tex rename to presentations/content/metadaten/tracking.tex diff --git a/content/metadaten/vds.tex b/presentations/content/metadaten/vds.tex similarity index 100% rename from content/metadaten/vds.tex rename to presentations/content/metadaten/vds.tex diff --git a/content/metadaten/zeitstempel.tex b/presentations/content/metadaten/zeitstempel.tex similarity index 100% rename from content/metadaten/zeitstempel.tex rename to presentations/content/metadaten/zeitstempel.tex diff --git a/content/motivation/freesoftware.tex b/presentations/content/motivation/freesoftware.tex similarity index 100% rename from content/motivation/freesoftware.tex rename to presentations/content/motivation/freesoftware.tex diff --git a/content/motivation/stasi_vs_nsa.tex b/presentations/content/motivation/stasi_vs_nsa.tex similarity index 100% rename from content/motivation/stasi_vs_nsa.tex rename to presentations/content/motivation/stasi_vs_nsa.tex diff --git a/content/soziale_netzwerke/geschaeftsmodelleraten.tex b/presentations/content/soziale_netzwerke/geschaeftsmodelleraten.tex similarity index 100% rename from content/soziale_netzwerke/geschaeftsmodelleraten.tex rename to presentations/content/soziale_netzwerke/geschaeftsmodelleraten.tex diff --git a/content/soziale_netzwerke/ocean_modell.tex b/presentations/content/soziale_netzwerke/ocean_modell.tex similarity index 100% rename from content/soziale_netzwerke/ocean_modell.tex rename to presentations/content/soziale_netzwerke/ocean_modell.tex diff --git a/content/soziale_netzwerke/umfrage.tex b/presentations/content/soziale_netzwerke/umfrage.tex similarity index 100% rename from content/soziale_netzwerke/umfrage.tex rename to presentations/content/soziale_netzwerke/umfrage.tex diff --git a/content/soziale_netzwerke/umgangsformen.tex b/presentations/content/soziale_netzwerke/umgangsformen.tex similarity index 100% rename from content/soziale_netzwerke/umgangsformen.tex rename to presentations/content/soziale_netzwerke/umgangsformen.tex diff --git a/content/tracking/browser_fingerprinting.tex b/presentations/content/tracking/browser_fingerprinting.tex similarity index 100% rename from content/tracking/browser_fingerprinting.tex rename to presentations/content/tracking/browser_fingerprinting.tex diff --git a/content/tracking/tracking.tex b/presentations/content/tracking/tracking.tex similarity index 100% rename from content/tracking/tracking.tex rename to presentations/content/tracking/tracking.tex diff --git a/content/verhalten/datensparsamkeit.tex b/presentations/content/verhalten/datensparsamkeit.tex similarity index 100% rename from content/verhalten/datensparsamkeit.tex rename to presentations/content/verhalten/datensparsamkeit.tex diff --git a/content/verhalten/passwoerter.tex b/presentations/content/verhalten/passwoerter.tex similarity index 100% rename from content/verhalten/passwoerter.tex rename to presentations/content/verhalten/passwoerter.tex diff --git a/content/verschluesselung/e2e.tex b/presentations/content/verschluesselung/e2e.tex similarity index 100% rename from content/verschluesselung/e2e.tex rename to presentations/content/verschluesselung/e2e.tex diff --git a/content/verschluesselung/https_everywhere.tex b/presentations/content/verschluesselung/https_everywhere.tex similarity index 100% rename from content/verschluesselung/https_everywhere.tex rename to presentations/content/verschluesselung/https_everywhere.tex diff --git a/content/verschluesselung/messenger_vergleich.tex b/presentations/content/verschluesselung/messenger_vergleich.tex similarity index 100% rename from content/verschluesselung/messenger_vergleich.tex rename to presentations/content/verschluesselung/messenger_vergleich.tex diff --git a/content/verschluesselung/tls.tex b/presentations/content/verschluesselung/tls.tex similarity index 100% rename from content/verschluesselung/tls.tex rename to presentations/content/verschluesselung/tls.tex diff --git a/content/wirtschaft/sharing-economy.tex b/presentations/content/wirtschaft/sharing-economy.tex similarity index 100% rename from content/wirtschaft/sharing-economy.tex rename to presentations/content/wirtschaft/sharing-economy.tex diff --git a/img/502400-64.png b/presentations/img/502400-64.png similarity index 100% rename from img/502400-64.png rename to presentations/img/502400-64.png diff --git a/img/Beta-badge.pdf b/presentations/img/Beta-badge.pdf similarity index 100% rename from img/Beta-badge.pdf rename to presentations/img/Beta-badge.pdf diff --git a/img/Beta-badge.svg b/presentations/img/Beta-badge.svg similarity index 100% rename from img/Beta-badge.svg rename to presentations/img/Beta-badge.svg diff --git a/img/F-Droid_Logo_2.pdf b/presentations/img/F-Droid_Logo_2.pdf similarity index 100% rename from img/F-Droid_Logo_2.pdf rename to presentations/img/F-Droid_Logo_2.pdf diff --git a/img/F-Droid_Logo_2.svg b/presentations/img/F-Droid_Logo_2.svg similarity index 100% rename from img/F-Droid_Logo_2.svg rename to presentations/img/F-Droid_Logo_2.svg diff --git a/img/Gnupg_logo.pdf b/presentations/img/Gnupg_logo.pdf similarity index 100% rename from img/Gnupg_logo.pdf rename to presentations/img/Gnupg_logo.pdf diff --git a/img/Gnupg_logo.svg b/presentations/img/Gnupg_logo.svg similarity index 100% rename from img/Gnupg_logo.svg rename to presentations/img/Gnupg_logo.svg diff --git a/img/Internet_map_1024.jpg b/presentations/img/Internet_map_1024.jpg similarity index 100% rename from img/Internet_map_1024.jpg rename to presentations/img/Internet_map_1024.jpg diff --git a/img/LibreOffice.pdf b/presentations/img/LibreOffice.pdf similarity index 100% rename from img/LibreOffice.pdf rename to presentations/img/LibreOffice.pdf diff --git a/img/LibreOffice.svg b/presentations/img/LibreOffice.svg similarity index 100% rename from img/LibreOffice.svg rename to presentations/img/LibreOffice.svg diff --git a/img/Mozilla_Thunderbird_3.png b/presentations/img/Mozilla_Thunderbird_3.png similarity index 100% rename from img/Mozilla_Thunderbird_3.png rename to presentations/img/Mozilla_Thunderbird_3.png diff --git a/img/Replicant_logo_alpha.pdf b/presentations/img/Replicant_logo_alpha.pdf similarity index 100% rename from img/Replicant_logo_alpha.pdf rename to presentations/img/Replicant_logo_alpha.pdf diff --git a/img/Replicant_logo_alpha.svg b/presentations/img/Replicant_logo_alpha.svg similarity index 100% rename from img/Replicant_logo_alpha.svg rename to presentations/img/Replicant_logo_alpha.svg diff --git a/img/TextSecure_Icon.png b/presentations/img/TextSecure_Icon.png similarity index 100% rename from img/TextSecure_Icon.png rename to presentations/img/TextSecure_Icon.png diff --git a/img/Tux.pdf b/presentations/img/Tux.pdf similarity index 100% rename from img/Tux.pdf rename to presentations/img/Tux.pdf diff --git a/img/Tux.svg b/presentations/img/Tux.svg similarity index 100% rename from img/Tux.svg rename to presentations/img/Tux.svg diff --git a/img/Wohnhaeuser_PHV.jpg b/presentations/img/Wohnhaeuser_PHV.jpg similarity index 100% rename from img/Wohnhaeuser_PHV.jpg rename to presentations/img/Wohnhaeuser_PHV.jpg diff --git a/img/Wohnhaeuser_PHV_cut.jpg b/presentations/img/Wohnhaeuser_PHV_cut.jpg similarity index 100% rename from img/Wohnhaeuser_PHV_cut.jpg rename to presentations/img/Wohnhaeuser_PHV_cut.jpg diff --git a/img/akten1.png b/presentations/img/akten1.png similarity index 100% rename from img/akten1.png rename to presentations/img/akten1.png diff --git a/img/akten2.png b/presentations/img/akten2.png similarity index 100% rename from img/akten2.png rename to presentations/img/akten2.png diff --git a/img/anonymous.jpg b/presentations/img/anonymous.jpg similarity index 100% rename from img/anonymous.jpg rename to presentations/img/anonymous.jpg diff --git a/img/asym_encryption.png b/presentations/img/asym_encryption.png similarity index 100% rename from img/asym_encryption.png rename to presentations/img/asym_encryption.png diff --git a/img/auth.png b/presentations/img/auth.png similarity index 100% rename from img/auth.png rename to presentations/img/auth.png diff --git a/img/backdoor-android.png b/presentations/img/backdoor-android.png similarity index 100% rename from img/backdoor-android.png rename to presentations/img/backdoor-android.png diff --git a/img/backdoor-apps.png b/presentations/img/backdoor-apps.png similarity index 100% rename from img/backdoor-apps.png rename to presentations/img/backdoor-apps.png diff --git a/img/backdoor-av.png b/presentations/img/backdoor-av.png similarity index 100% rename from img/backdoor-av.png rename to presentations/img/backdoor-av.png diff --git a/img/backdoor-flashlight.png b/presentations/img/backdoor-flashlight.png similarity index 100% rename from img/backdoor-flashlight.png rename to presentations/img/backdoor-flashlight.png diff --git a/img/backdoor-ios.png b/presentations/img/backdoor-ios.png similarity index 100% rename from img/backdoor-ios.png rename to presentations/img/backdoor-ios.png diff --git a/img/backdoor-samsung.png b/presentations/img/backdoor-samsung.png similarity index 100% rename from img/backdoor-samsung.png rename to presentations/img/backdoor-samsung.png diff --git a/img/backdoor-samsung2.png b/presentations/img/backdoor-samsung2.png similarity index 100% rename from img/backdoor-samsung2.png rename to presentations/img/backdoor-samsung2.png diff --git a/img/backdoor-windows.png b/presentations/img/backdoor-windows.png similarity index 100% rename from img/backdoor-windows.png rename to presentations/img/backdoor-windows.png diff --git a/img/backdoor-windows2.png b/presentations/img/backdoor-windows2.png similarity index 100% rename from img/backdoor-windows2.png rename to presentations/img/backdoor-windows2.png diff --git a/img/backdoor_gb.png b/presentations/img/backdoor_gb.png similarity index 100% rename from img/backdoor_gb.png rename to presentations/img/backdoor_gb.png diff --git a/img/better_privacy.png b/presentations/img/better_privacy.png similarity index 100% rename from img/better_privacy.png rename to presentations/img/better_privacy.png diff --git a/img/bitmessagelogo.png b/presentations/img/bitmessagelogo.png similarity index 100% rename from img/bitmessagelogo.png rename to presentations/img/bitmessagelogo.png diff --git a/img/bote.jpg b/presentations/img/bote.jpg similarity index 100% rename from img/bote.jpg rename to presentations/img/bote.jpg diff --git a/img/bridge1.png b/presentations/img/bridge1.png similarity index 100% rename from img/bridge1.png rename to presentations/img/bridge1.png diff --git a/img/bridge2.png b/presentations/img/bridge2.png similarity index 100% rename from img/bridge2.png rename to presentations/img/bridge2.png diff --git a/img/browser_fingerprint.png b/presentations/img/browser_fingerprint.png similarity index 100% rename from img/browser_fingerprint.png rename to presentations/img/browser_fingerprint.png diff --git a/img/business_pigs.jpg b/presentations/img/business_pigs.jpg similarity index 100% rename from img/business_pigs.jpg rename to presentations/img/business_pigs.jpg diff --git a/img/by-nc-nd.png b/presentations/img/by-nc-nd.png similarity index 100% rename from img/by-nc-nd.png rename to presentations/img/by-nc-nd.png diff --git a/img/by-nc-sa.png b/presentations/img/by-nc-sa.png similarity index 100% rename from img/by-nc-sa.png rename to presentations/img/by-nc-sa.png diff --git a/img/by-sa.png b/presentations/img/by-sa.png similarity index 100% rename from img/by-sa.png rename to presentations/img/by-sa.png diff --git a/img/by.png b/presentations/img/by.png similarity index 100% rename from img/by.png rename to presentations/img/by.png diff --git a/img/c-s.png b/presentations/img/c-s.png similarity index 100% rename from img/c-s.png rename to presentations/img/c-s.png diff --git a/img/c3d2.pdf b/presentations/img/c3d2.pdf similarity index 100% rename from img/c3d2.pdf rename to presentations/img/c3d2.pdf diff --git a/img/c3d2.svg b/presentations/img/c3d2.svg similarity index 100% rename from img/c3d2.svg rename to presentations/img/c3d2.svg diff --git a/img/c3d2_logo.png b/presentations/img/c3d2_logo.png similarity index 100% rename from img/c3d2_logo.png rename to presentations/img/c3d2_logo.png diff --git a/img/certificate.png b/presentations/img/certificate.png similarity index 100% rename from img/certificate.png rename to presentations/img/certificate.png diff --git a/img/chaosknoten.png b/presentations/img/chaosknoten.png similarity index 100% rename from img/chaosknoten.png rename to presentations/img/chaosknoten.png diff --git a/img/chatsecure.png b/presentations/img/chatsecure.png similarity index 100% rename from img/chatsecure.png rename to presentations/img/chatsecure.png diff --git a/img/client-server-graph.png b/presentations/img/client-server-graph.png similarity index 100% rename from img/client-server-graph.png rename to presentations/img/client-server-graph.png diff --git a/img/cms.png b/presentations/img/cms.png similarity index 100% rename from img/cms.png rename to presentations/img/cms.png diff --git a/img/compilation-process.png b/presentations/img/compilation-process.png similarity index 100% rename from img/compilation-process.png rename to presentations/img/compilation-process.png diff --git a/img/conversations-identity.jpg b/presentations/img/conversations-identity.jpg similarity index 100% rename from img/conversations-identity.jpg rename to presentations/img/conversations-identity.jpg diff --git a/img/conversations.jpg b/presentations/img/conversations.jpg similarity index 100% rename from img/conversations.jpg rename to presentations/img/conversations.jpg diff --git a/img/conversations.png b/presentations/img/conversations.png similarity index 100% rename from img/conversations.png rename to presentations/img/conversations.png diff --git a/img/data_center.jpg b/presentations/img/data_center.jpg similarity index 100% rename from img/data_center.jpg rename to presentations/img/data_center.jpg diff --git a/img/daten.png b/presentations/img/daten.png similarity index 100% rename from img/daten.png rename to presentations/img/daten.png diff --git a/img/de_cix.jpg b/presentations/img/de_cix.jpg similarity index 100% rename from img/de_cix.jpg rename to presentations/img/de_cix.jpg diff --git a/img/decentralise-all-the-things.jpg b/presentations/img/decentralise-all-the-things.jpg similarity index 100% rename from img/decentralise-all-the-things.jpg rename to presentations/img/decentralise-all-the-things.jpg diff --git a/img/digitale_selbstverteidigung.png b/presentations/img/digitale_selbstverteidigung.png similarity index 100% rename from img/digitale_selbstverteidigung.png rename to presentations/img/digitale_selbstverteidigung.png diff --git a/img/direkt.png b/presentations/img/direkt.png similarity index 100% rename from img/direkt.png rename to presentations/img/direkt.png diff --git a/img/disconnect.png b/presentations/img/disconnect.png similarity index 100% rename from img/disconnect.png rename to presentations/img/disconnect.png diff --git a/img/disconnectme.jpg b/presentations/img/disconnectme.jpg similarity index 100% rename from img/disconnectme.jpg rename to presentations/img/disconnectme.jpg diff --git a/img/duckduckgo.pdf b/presentations/img/duckduckgo.pdf similarity index 100% rename from img/duckduckgo.pdf rename to presentations/img/duckduckgo.pdf diff --git a/img/duckduckgo.png b/presentations/img/duckduckgo.png similarity index 100% rename from img/duckduckgo.png rename to presentations/img/duckduckgo.png diff --git a/img/duckduckgo.svg b/presentations/img/duckduckgo.svg similarity index 100% rename from img/duckduckgo.svg rename to presentations/img/duckduckgo.svg diff --git a/img/emailselfdefense.png b/presentations/img/emailselfdefense.png similarity index 100% rename from img/emailselfdefense.png rename to presentations/img/emailselfdefense.png diff --git a/img/enc-e2e.png b/presentations/img/enc-e2e.png similarity index 100% rename from img/enc-e2e.png rename to presentations/img/enc-e2e.png diff --git a/img/enc-transport.png b/presentations/img/enc-transport.png similarity index 100% rename from img/enc-transport.png rename to presentations/img/enc-transport.png diff --git a/img/facebook_whatsapp.png b/presentations/img/facebook_whatsapp.png similarity index 100% rename from img/facebook_whatsapp.png rename to presentations/img/facebook_whatsapp.png diff --git a/img/fdroid.png b/presentations/img/fdroid.png similarity index 100% rename from img/fdroid.png rename to presentations/img/fdroid.png diff --git a/img/fdroid1.png b/presentations/img/fdroid1.png similarity index 100% rename from img/fdroid1.png rename to presentations/img/fdroid1.png diff --git a/img/fdroid2.png b/presentations/img/fdroid2.png similarity index 100% rename from img/fdroid2.png rename to presentations/img/fdroid2.png diff --git a/img/fed-all.png b/presentations/img/fed-all.png similarity index 100% rename from img/fed-all.png rename to presentations/img/fed-all.png diff --git a/img/fed-bad-guy.png b/presentations/img/fed-bad-guy.png similarity index 100% rename from img/fed-bad-guy.png rename to presentations/img/fed-bad-guy.png diff --git a/img/fed-clients-comm.png b/presentations/img/fed-clients-comm.png similarity index 100% rename from img/fed-clients-comm.png rename to presentations/img/fed-clients-comm.png diff --git a/img/fed-clients.png b/presentations/img/fed-clients.png similarity index 100% rename from img/fed-clients.png rename to presentations/img/fed-clients.png diff --git a/img/fed-end-to-end.png b/presentations/img/fed-end-to-end.png similarity index 100% rename from img/fed-end-to-end.png rename to presentations/img/fed-end-to-end.png diff --git a/img/fed-none.png b/presentations/img/fed-none.png similarity index 100% rename from img/fed-none.png rename to presentations/img/fed-none.png diff --git a/img/fed-social.png b/presentations/img/fed-social.png similarity index 100% rename from img/fed-social.png rename to presentations/img/fed-social.png diff --git a/img/fed.png b/presentations/img/fed.png similarity index 100% rename from img/fed.png rename to presentations/img/fed.png diff --git a/img/ff_antitrack.png b/presentations/img/ff_antitrack.png similarity index 100% rename from img/ff_antitrack.png rename to presentations/img/ff_antitrack.png diff --git a/img/fingerabdruck.jpg b/presentations/img/fingerabdruck.jpg similarity index 100% rename from img/fingerabdruck.jpg rename to presentations/img/fingerabdruck.jpg diff --git a/img/firefox-klar.jpg b/presentations/img/firefox-klar.jpg similarity index 100% rename from img/firefox-klar.jpg rename to presentations/img/firefox-klar.jpg diff --git a/img/firefox-mobil-antitracking.png b/presentations/img/firefox-mobil-antitracking.png similarity index 100% rename from img/firefox-mobil-antitracking.png rename to presentations/img/firefox-mobil-antitracking.png diff --git a/img/firefox.png b/presentations/img/firefox.png similarity index 100% rename from img/firefox.png rename to presentations/img/firefox.png diff --git a/img/foodsharing-cut.jpg b/presentations/img/foodsharing-cut.jpg similarity index 100% rename from img/foodsharing-cut.jpg rename to presentations/img/foodsharing-cut.jpg diff --git a/img/foodsharing.jpg b/presentations/img/foodsharing.jpg similarity index 100% rename from img/foodsharing.jpg rename to presentations/img/foodsharing.jpg diff --git a/img/formatstring.png b/presentations/img/formatstring.png similarity index 100% rename from img/formatstring.png rename to presentations/img/formatstring.png diff --git a/img/gnome.png b/presentations/img/gnome.png similarity index 100% rename from img/gnome.png rename to presentations/img/gnome.png diff --git a/img/google-adid.png b/presentations/img/google-adid.png similarity index 100% rename from img/google-adid.png rename to presentations/img/google-adid.png diff --git a/img/google_heat_1.png b/presentations/img/google_heat_1.png similarity index 100% rename from img/google_heat_1.png rename to presentations/img/google_heat_1.png diff --git a/img/google_heat_2.png b/presentations/img/google_heat_2.png similarity index 100% rename from img/google_heat_2.png rename to presentations/img/google_heat_2.png diff --git a/img/gpg.mp4 b/presentations/img/gpg.mp4 similarity index 100% rename from img/gpg.mp4 rename to presentations/img/gpg.mp4 diff --git a/img/gpg.png b/presentations/img/gpg.png similarity index 100% rename from img/gpg.png rename to presentations/img/gpg.png diff --git a/img/gpgvideo.png b/presentations/img/gpgvideo.png similarity index 100% rename from img/gpgvideo.png rename to presentations/img/gpgvideo.png diff --git a/img/heise-merkel.png b/presentations/img/heise-merkel.png similarity index 100% rename from img/heise-merkel.png rename to presentations/img/heise-merkel.png diff --git a/img/heise_lavabit.png b/presentations/img/heise_lavabit.png similarity index 100% rename from img/heise_lavabit.png rename to presentations/img/heise_lavabit.png diff --git a/img/https-everywhere.png b/presentations/img/https-everywhere.png similarity index 100% rename from img/https-everywhere.png rename to presentations/img/https-everywhere.png diff --git a/img/https_everywhere.png b/presentations/img/https_everywhere.png similarity index 100% rename from img/https_everywhere.png rename to presentations/img/https_everywhere.png diff --git a/img/icecoldminimalism.jpg b/presentations/img/icecoldminimalism.jpg similarity index 100% rename from img/icecoldminimalism.jpg rename to presentations/img/icecoldminimalism.jpg diff --git a/img/internet_cable_map.png b/presentations/img/internet_cable_map.png similarity index 100% rename from img/internet_cable_map.png rename to presentations/img/internet_cable_map.png diff --git a/img/internet_dog.jpg b/presentations/img/internet_dog.jpg similarity index 100% rename from img/internet_dog.jpg rename to presentations/img/internet_dog.jpg diff --git a/img/internetmap-abhoeren-prism-ssl.pdf b/presentations/img/internetmap-abhoeren-prism-ssl.pdf similarity index 100% rename from img/internetmap-abhoeren-prism-ssl.pdf rename to presentations/img/internetmap-abhoeren-prism-ssl.pdf diff --git a/img/internetmap-abhoeren-prism-ssl.svg b/presentations/img/internetmap-abhoeren-prism-ssl.svg similarity index 100% rename from img/internetmap-abhoeren-prism-ssl.svg rename to presentations/img/internetmap-abhoeren-prism-ssl.svg diff --git a/img/internetmap-abhoeren-prism.pdf b/presentations/img/internetmap-abhoeren-prism.pdf similarity index 100% rename from img/internetmap-abhoeren-prism.pdf rename to presentations/img/internetmap-abhoeren-prism.pdf diff --git a/img/internetmap-abhoeren-prism.svg b/presentations/img/internetmap-abhoeren-prism.svg similarity index 100% rename from img/internetmap-abhoeren-prism.svg rename to presentations/img/internetmap-abhoeren-prism.svg diff --git a/img/internetmap-abhoeren-ssl.pdf b/presentations/img/internetmap-abhoeren-ssl.pdf similarity index 100% rename from img/internetmap-abhoeren-ssl.pdf rename to presentations/img/internetmap-abhoeren-ssl.pdf diff --git a/img/internetmap-abhoeren-ssl.svg b/presentations/img/internetmap-abhoeren-ssl.svg similarity index 100% rename from img/internetmap-abhoeren-ssl.svg rename to presentations/img/internetmap-abhoeren-ssl.svg diff --git a/img/internetmap-abhoeren-tempora-prism.pdf b/presentations/img/internetmap-abhoeren-tempora-prism.pdf similarity index 100% rename from img/internetmap-abhoeren-tempora-prism.pdf rename to presentations/img/internetmap-abhoeren-tempora-prism.pdf diff --git a/img/internetmap-abhoeren-tempora-prism.svg b/presentations/img/internetmap-abhoeren-tempora-prism.svg similarity index 100% rename from img/internetmap-abhoeren-tempora-prism.svg rename to presentations/img/internetmap-abhoeren-tempora-prism.svg diff --git a/img/internetmap-abhoeren-tempora.pdf b/presentations/img/internetmap-abhoeren-tempora.pdf similarity index 100% rename from img/internetmap-abhoeren-tempora.pdf rename to presentations/img/internetmap-abhoeren-tempora.pdf diff --git a/img/internetmap-abhoeren-tempora.svg b/presentations/img/internetmap-abhoeren-tempora.svg similarity index 100% rename from img/internetmap-abhoeren-tempora.svg rename to presentations/img/internetmap-abhoeren-tempora.svg diff --git a/img/internetmap-abhoeren-tor.pdf b/presentations/img/internetmap-abhoeren-tor.pdf similarity index 100% rename from img/internetmap-abhoeren-tor.pdf rename to presentations/img/internetmap-abhoeren-tor.pdf diff --git a/img/internetmap-abhoeren-tor.svg b/presentations/img/internetmap-abhoeren-tor.svg similarity index 100% rename from img/internetmap-abhoeren-tor.svg rename to presentations/img/internetmap-abhoeren-tor.svg diff --git a/img/internetmap-abhoeren.pdf b/presentations/img/internetmap-abhoeren.pdf similarity index 100% rename from img/internetmap-abhoeren.pdf rename to presentations/img/internetmap-abhoeren.pdf diff --git a/img/internetmap-abhoeren.svg b/presentations/img/internetmap-abhoeren.svg similarity index 100% rename from img/internetmap-abhoeren.svg rename to presentations/img/internetmap-abhoeren.svg diff --git a/img/jabber.png b/presentations/img/jabber.png similarity index 100% rename from img/jabber.png rename to presentations/img/jabber.png diff --git a/img/jim_verkaufen.png b/presentations/img/jim_verkaufen.png similarity index 100% rename from img/jim_verkaufen.png rename to presentations/img/jim_verkaufen.png diff --git a/img/krypto.pdf b/presentations/img/krypto.pdf similarity index 100% rename from img/krypto.pdf rename to presentations/img/krypto.pdf diff --git a/img/krypto.png b/presentations/img/krypto.png similarity index 100% rename from img/krypto.png rename to presentations/img/krypto.png diff --git a/img/krypto.svg b/presentations/img/krypto.svg similarity index 100% rename from img/krypto.svg rename to presentations/img/krypto.svg diff --git a/img/krypto_asymmetric.pdf b/presentations/img/krypto_asymmetric.pdf similarity index 100% rename from img/krypto_asymmetric.pdf rename to presentations/img/krypto_asymmetric.pdf diff --git a/img/krypto_asymmetric.svg b/presentations/img/krypto_asymmetric.svg similarity index 100% rename from img/krypto_asymmetric.svg rename to presentations/img/krypto_asymmetric.svg diff --git a/img/krypto_symmetric.pdf b/presentations/img/krypto_symmetric.pdf similarity index 100% rename from img/krypto_symmetric.pdf rename to presentations/img/krypto_symmetric.pdf diff --git a/img/krypto_symmetric.svg b/presentations/img/krypto_symmetric.svg similarity index 100% rename from img/krypto_symmetric.svg rename to presentations/img/krypto_symmetric.svg diff --git a/img/libreoffice.jpg b/presentations/img/libreoffice.jpg similarity index 100% rename from img/libreoffice.jpg rename to presentations/img/libreoffice.jpg diff --git a/img/lightbeam.jpg b/presentations/img/lightbeam.jpg similarity index 100% rename from img/lightbeam.jpg rename to presentations/img/lightbeam.jpg diff --git a/img/lightbeam.png b/presentations/img/lightbeam.png similarity index 100% rename from img/lightbeam.png rename to presentations/img/lightbeam.png diff --git a/img/lightbeam_1.png b/presentations/img/lightbeam_1.png similarity index 100% rename from img/lightbeam_1.png rename to presentations/img/lightbeam_1.png diff --git a/img/lightbeam_2.png b/presentations/img/lightbeam_2.png similarity index 100% rename from img/lightbeam_2.png rename to presentations/img/lightbeam_2.png diff --git a/img/logo-fsf.pdf b/presentations/img/logo-fsf.pdf similarity index 100% rename from img/logo-fsf.pdf rename to presentations/img/logo-fsf.pdf diff --git a/img/logo-fsf.svg b/presentations/img/logo-fsf.svg similarity index 100% rename from img/logo-fsf.svg rename to presentations/img/logo-fsf.svg diff --git a/img/mail.pdf b/presentations/img/mail.pdf similarity index 100% rename from img/mail.pdf rename to presentations/img/mail.pdf diff --git a/img/mail.svg b/presentations/img/mail.svg similarity index 100% rename from img/mail.svg rename to presentations/img/mail.svg diff --git a/img/maltespitz.png b/presentations/img/maltespitz.png similarity index 100% rename from img/maltespitz.png rename to presentations/img/maltespitz.png diff --git a/img/metadaten_studie.png b/presentations/img/metadaten_studie.png similarity index 100% rename from img/metadaten_studie.png rename to presentations/img/metadaten_studie.png diff --git a/img/networkgraph.png b/presentations/img/networkgraph.png similarity index 100% rename from img/networkgraph.png rename to presentations/img/networkgraph.png diff --git a/img/netzpolitik-verizon.png b/presentations/img/netzpolitik-verizon.png similarity index 100% rename from img/netzpolitik-verizon.png rename to presentations/img/netzpolitik-verizon.png diff --git a/img/nextcloud1.png b/presentations/img/nextcloud1.png similarity index 100% rename from img/nextcloud1.png rename to presentations/img/nextcloud1.png diff --git a/img/nextcloud2.png b/presentations/img/nextcloud2.png similarity index 100% rename from img/nextcloud2.png rename to presentations/img/nextcloud2.png diff --git a/img/nextcloud3.png b/presentations/img/nextcloud3.png similarity index 100% rename from img/nextcloud3.png rename to presentations/img/nextcloud3.png diff --git a/img/nextcloud4.png b/presentations/img/nextcloud4.png similarity index 100% rename from img/nextcloud4.png rename to presentations/img/nextcloud4.png diff --git a/img/nextcloud5.png b/presentations/img/nextcloud5.png similarity index 100% rename from img/nextcloud5.png rename to presentations/img/nextcloud5.png diff --git a/img/nextcloud6.png b/presentations/img/nextcloud6.png similarity index 100% rename from img/nextcloud6.png rename to presentations/img/nextcloud6.png diff --git a/img/noscript.png b/presentations/img/noscript.png similarity index 100% rename from img/noscript.png rename to presentations/img/noscript.png diff --git a/img/ocean-facebook-studie.png b/presentations/img/ocean-facebook-studie.png similarity index 100% rename from img/ocean-facebook-studie.png rename to presentations/img/ocean-facebook-studie.png diff --git a/img/ocean-modell.png b/presentations/img/ocean-modell.png similarity index 100% rename from img/ocean-modell.png rename to presentations/img/ocean-modell.png diff --git a/img/openrouteservice.png b/presentations/img/openrouteservice.png similarity index 100% rename from img/openrouteservice.png rename to presentations/img/openrouteservice.png diff --git a/img/orbot.png b/presentations/img/orbot.png similarity index 100% rename from img/orbot.png rename to presentations/img/orbot.png diff --git a/img/orbot1.png b/presentations/img/orbot1.png similarity index 100% rename from img/orbot1.png rename to presentations/img/orbot1.png diff --git a/img/osm.png b/presentations/img/osm.png similarity index 100% rename from img/osm.png rename to presentations/img/osm.png diff --git a/img/osmand.png b/presentations/img/osmand.png similarity index 100% rename from img/osmand.png rename to presentations/img/osmand.png diff --git a/img/owncloud-calendar.png b/presentations/img/owncloud-calendar.png similarity index 100% rename from img/owncloud-calendar.png rename to presentations/img/owncloud-calendar.png diff --git a/img/owncloud-contacts.png b/presentations/img/owncloud-contacts.png similarity index 100% rename from img/owncloud-contacts.png rename to presentations/img/owncloud-contacts.png diff --git a/img/owncloud-documents.png b/presentations/img/owncloud-documents.png similarity index 100% rename from img/owncloud-documents.png rename to presentations/img/owncloud-documents.png diff --git a/img/owncloud-screenshot.jpg b/presentations/img/owncloud-screenshot.jpg similarity index 100% rename from img/owncloud-screenshot.jpg rename to presentations/img/owncloud-screenshot.jpg diff --git a/img/owncloud.png b/presentations/img/owncloud.png similarity index 100% rename from img/owncloud.png rename to presentations/img/owncloud.png diff --git a/img/palava-tv.png b/presentations/img/palava-tv.png similarity index 100% rename from img/palava-tv.png rename to presentations/img/palava-tv.png diff --git a/img/palava.png b/presentations/img/palava.png similarity index 100% rename from img/palava.png rename to presentations/img/palava.png diff --git a/img/pentabug.jpg b/presentations/img/pentabug.jpg similarity index 100% rename from img/pentabug.jpg rename to presentations/img/pentabug.jpg diff --git a/img/permissions-android.png b/presentations/img/permissions-android.png similarity index 100% rename from img/permissions-android.png rename to presentations/img/permissions-android.png diff --git a/img/permissions.png b/presentations/img/permissions.png similarity index 100% rename from img/permissions.png rename to presentations/img/permissions.png diff --git a/img/phone-contacts.jpg b/presentations/img/phone-contacts.jpg similarity index 100% rename from img/phone-contacts.jpg rename to presentations/img/phone-contacts.jpg diff --git a/img/platformbusinessmodelcanvas.png b/presentations/img/platformbusinessmodelcanvas.png similarity index 100% rename from img/platformbusinessmodelcanvas.png rename to presentations/img/platformbusinessmodelcanvas.png diff --git a/img/plugins.png b/presentations/img/plugins.png similarity index 100% rename from img/plugins.png rename to presentations/img/plugins.png diff --git a/img/prism-break1.png b/presentations/img/prism-break1.png similarity index 100% rename from img/prism-break1.png rename to presentations/img/prism-break1.png diff --git a/img/prism-break2.png b/presentations/img/prism-break2.png similarity index 100% rename from img/prism-break2.png rename to presentations/img/prism-break2.png diff --git a/img/prism.jpg b/presentations/img/prism.jpg similarity index 100% rename from img/prism.jpg rename to presentations/img/prism.jpg diff --git a/img/prism_netzpolitik.png b/presentations/img/prism_netzpolitik.png similarity index 100% rename from img/prism_netzpolitik.png rename to presentations/img/prism_netzpolitik.png diff --git a/img/punch_1.png b/presentations/img/punch_1.png similarity index 100% rename from img/punch_1.png rename to presentations/img/punch_1.png diff --git a/img/punch_2.png b/presentations/img/punch_2.png similarity index 100% rename from img/punch_2.png rename to presentations/img/punch_2.png diff --git a/img/punch_3.png b/presentations/img/punch_3.png similarity index 100% rename from img/punch_3.png rename to presentations/img/punch_3.png diff --git a/img/sandstorm.png b/presentations/img/sandstorm.png similarity index 100% rename from img/sandstorm.png rename to presentations/img/sandstorm.png diff --git a/img/seacable1.jpg b/presentations/img/seacable1.jpg similarity index 100% rename from img/seacable1.jpg rename to presentations/img/seacable1.jpg diff --git a/img/security-apps.png b/presentations/img/security-apps.png similarity index 100% rename from img/security-apps.png rename to presentations/img/security-apps.png diff --git a/img/security-whatsapp.png b/presentations/img/security-whatsapp.png similarity index 100% rename from img/security-whatsapp.png rename to presentations/img/security-whatsapp.png diff --git a/img/signal-android.png b/presentations/img/signal-android.png similarity index 100% rename from img/signal-android.png rename to presentations/img/signal-android.png diff --git a/img/signal-identity.jpg b/presentations/img/signal-identity.jpg similarity index 100% rename from img/signal-identity.jpg rename to presentations/img/signal-identity.jpg diff --git a/img/signal-ios.jpg b/presentations/img/signal-ios.jpg similarity index 100% rename from img/signal-ios.jpg rename to presentations/img/signal-ios.jpg diff --git a/img/signal-logo.png b/presentations/img/signal-logo.png similarity index 100% rename from img/signal-logo.png rename to presentations/img/signal-logo.png diff --git a/img/signal1.png b/presentations/img/signal1.png similarity index 100% rename from img/signal1.png rename to presentations/img/signal1.png diff --git a/img/signal2.png b/presentations/img/signal2.png similarity index 100% rename from img/signal2.png rename to presentations/img/signal2.png diff --git a/img/snowden.jpg b/presentations/img/snowden.jpg similarity index 100% rename from img/snowden.jpg rename to presentations/img/snowden.jpg diff --git a/img/social-media-fingerprint.png b/presentations/img/social-media-fingerprint.png similarity index 100% rename from img/social-media-fingerprint.png rename to presentations/img/social-media-fingerprint.png diff --git a/img/socialgraph.jpg b/presentations/img/socialgraph.jpg similarity index 100% rename from img/socialgraph.jpg rename to presentations/img/socialgraph.jpg diff --git a/img/spiegel-tempora.png b/presentations/img/spiegel-tempora.png similarity index 100% rename from img/spiegel-tempora.png rename to presentations/img/spiegel-tempora.png diff --git a/img/ssl_badcert.png b/presentations/img/ssl_badcert.png similarity index 100% rename from img/ssl_badcert.png rename to presentations/img/ssl_badcert.png diff --git a/img/ssl_special.png b/presentations/img/ssl_special.png similarity index 100% rename from img/ssl_special.png rename to presentations/img/ssl_special.png diff --git a/img/ssl_unverified.png b/presentations/img/ssl_unverified.png similarity index 100% rename from img/ssl_unverified.png rename to presentations/img/ssl_unverified.png diff --git a/img/ssl_verified.png b/presentations/img/ssl_verified.png similarity index 100% rename from img/ssl_verified.png rename to presentations/img/ssl_verified.png diff --git a/img/stallman.jpg b/presentations/img/stallman.jpg similarity index 100% rename from img/stallman.jpg rename to presentations/img/stallman.jpg diff --git a/img/startp_logo.png b/presentations/img/startp_logo.png similarity index 100% rename from img/startp_logo.png rename to presentations/img/startp_logo.png diff --git a/img/stille_sms.png b/presentations/img/stille_sms.png similarity index 100% rename from img/stille_sms.png rename to presentations/img/stille_sms.png diff --git a/img/tagesschau-vds.png b/presentations/img/tagesschau-vds.png similarity index 100% rename from img/tagesschau-vds.png rename to presentations/img/tagesschau-vds.png diff --git a/img/telekom_mail.png b/presentations/img/telekom_mail.png similarity index 100% rename from img/telekom_mail.png rename to presentations/img/telekom_mail.png diff --git a/img/text_data_mining.jpg b/presentations/img/text_data_mining.jpg similarity index 100% rename from img/text_data_mining.jpg rename to presentations/img/text_data_mining.jpg diff --git a/img/textsecure1.png b/presentations/img/textsecure1.png similarity index 100% rename from img/textsecure1.png rename to presentations/img/textsecure1.png diff --git a/img/textsecure2.png b/presentations/img/textsecure2.png similarity index 100% rename from img/textsecure2.png rename to presentations/img/textsecure2.png diff --git a/img/thunderbird.png b/presentations/img/thunderbird.png similarity index 100% rename from img/thunderbird.png rename to presentations/img/thunderbird.png diff --git a/img/tls.pdf b/presentations/img/tls.pdf similarity index 100% rename from img/tls.pdf rename to presentations/img/tls.pdf diff --git a/img/tls.svg b/presentations/img/tls.svg similarity index 100% rename from img/tls.svg rename to presentations/img/tls.svg diff --git a/img/tor-banner.png b/presentations/img/tor-banner.png similarity index 100% rename from img/tor-banner.png rename to presentations/img/tor-banner.png diff --git a/img/tor-tuerkei.jpg b/presentations/img/tor-tuerkei.jpg similarity index 100% rename from img/tor-tuerkei.jpg rename to presentations/img/tor-tuerkei.jpg diff --git a/img/tor.png b/presentations/img/tor.png similarity index 100% rename from img/tor.png rename to presentations/img/tor.png diff --git a/img/tor1.png b/presentations/img/tor1.png similarity index 100% rename from img/tor1.png rename to presentations/img/tor1.png diff --git a/img/tor2.png b/presentations/img/tor2.png similarity index 100% rename from img/tor2.png rename to presentations/img/tor2.png diff --git a/img/tor3.png b/presentations/img/tor3.png similarity index 100% rename from img/tor3.png rename to presentations/img/tor3.png diff --git a/img/tor_browser.jpg b/presentations/img/tor_browser.jpg similarity index 100% rename from img/tor_browser.jpg rename to presentations/img/tor_browser.jpg diff --git a/img/tor_bundle.png b/presentations/img/tor_bundle.png similarity index 100% rename from img/tor_bundle.png rename to presentations/img/tor_bundle.png diff --git a/img/tor_bundle.xcf b/presentations/img/tor_bundle.xcf similarity index 100% rename from img/tor_bundle.xcf rename to presentations/img/tor_bundle.xcf diff --git a/img/torbrowser1.png b/presentations/img/torbrowser1.png similarity index 100% rename from img/torbrowser1.png rename to presentations/img/torbrowser1.png diff --git a/img/torbrowser2.png b/presentations/img/torbrowser2.png similarity index 100% rename from img/torbrowser2.png rename to presentations/img/torbrowser2.png diff --git a/img/torgermany.jpg b/presentations/img/torgermany.jpg similarity index 100% rename from img/torgermany.jpg rename to presentations/img/torgermany.jpg diff --git a/img/torrorist.png b/presentations/img/torrorist.png similarity index 100% rename from img/torrorist.png rename to presentations/img/torrorist.png diff --git a/img/torstinks.png b/presentations/img/torstinks.png similarity index 100% rename from img/torstinks.png rename to presentations/img/torstinks.png diff --git a/img/traceroute-facebook.png b/presentations/img/traceroute-facebook.png similarity index 100% rename from img/traceroute-facebook.png rename to presentations/img/traceroute-facebook.png diff --git a/img/traceroute.png b/presentations/img/traceroute.png similarity index 100% rename from img/traceroute.png rename to presentations/img/traceroute.png diff --git a/img/trojaner.png b/presentations/img/trojaner.png similarity index 100% rename from img/trojaner.png rename to presentations/img/trojaner.png diff --git a/img/ublock-edge-extension.png b/presentations/img/ublock-edge-extension.png similarity index 100% rename from img/ublock-edge-extension.png rename to presentations/img/ublock-edge-extension.png diff --git a/img/vidalia.png b/presentations/img/vidalia.png similarity index 100% rename from img/vidalia.png rename to presentations/img/vidalia.png diff --git a/img/vlc.png b/presentations/img/vlc.png similarity index 100% rename from img/vlc.png rename to presentations/img/vlc.png diff --git a/img/weboftrust.png b/presentations/img/weboftrust.png similarity index 100% rename from img/weboftrust.png rename to presentations/img/weboftrust.png diff --git a/img/wekillpeople.jpg b/presentations/img/wekillpeople.jpg similarity index 100% rename from img/wekillpeople.jpg rename to presentations/img/wekillpeople.jpg diff --git a/img/weknowwhatyouredoing.png b/presentations/img/weknowwhatyouredoing.png similarity index 100% rename from img/weknowwhatyouredoing.png rename to presentations/img/weknowwhatyouredoing.png diff --git a/img/windows10.png b/presentations/img/windows10.png similarity index 100% rename from img/windows10.png rename to presentations/img/windows10.png diff --git a/img/xmpp1.png b/presentations/img/xmpp1.png similarity index 100% rename from img/xmpp1.png rename to presentations/img/xmpp1.png diff --git a/img/zensur-guardian.jpg b/presentations/img/zensur-guardian.jpg similarity index 100% rename from img/zensur-guardian.jpg rename to presentations/img/zensur-guardian.jpg diff --git a/img/zensur.png b/presentations/img/zensur.png similarity index 100% rename from img/zensur.png rename to presentations/img/zensur.png diff --git a/img/zertifikate.png b/presentations/img/zertifikate.png similarity index 100% rename from img/zertifikate.png rename to presentations/img/zertifikate.png From d8dd78b8d1163e69d484ed55b0fde379722ca4f3 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 19:11:04 +0200 Subject: [PATCH 07/25] Update .gitignore --- .gitignore | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a99e160..8a53aa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ -dates/* -!dates/*.yaml -decks/* -!decks/*.yaml *.aux *.log +*.toc +*.nav +*.snm +*.out +*.synctex.gz +/presentations/*.pdf +/presentations/auto From 64832abf4e83a0b861e66e0453a2db7804ebbe6e Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 20:09:56 +0200 Subject: [PATCH 08/25] Converted remaining yaml files to LaTeX presentations --- presentations/16_06_22.yaml | 6 -- presentations/16_12_13.yaml | 6 -- presentations/17_05_20.yaml | 6 -- presentations/18_02_06.yaml | 6 -- .../2016-06-22_alles-7-8kl-90min.tex | 58 +++++++++++++++ .../2016-12-13_foej-workshop-180min.tex | 34 +++++++++ ...ss.tex => 2017-05-20_medinetzkongress.tex} | 0 presentations/2018-02-06_saferinternetday.tex | 58 +++++++++++++++ presentations/alles-7-8kl-90min.tex | 72 ------------------- presentations/alles-7-8kl-90min.yaml | 41 ----------- presentations/foej-workshop-180min.yaml | 21 ------ presentations/saferinternetday.yaml | 41 ----------- 12 files changed, 150 insertions(+), 199 deletions(-) delete mode 100644 presentations/16_06_22.yaml delete mode 100644 presentations/16_12_13.yaml delete mode 100644 presentations/17_05_20.yaml delete mode 100644 presentations/18_02_06.yaml create mode 100644 presentations/2016-06-22_alles-7-8kl-90min.tex create mode 100644 presentations/2016-12-13_foej-workshop-180min.tex rename presentations/{medinetzkongress.tex => 2017-05-20_medinetzkongress.tex} (100%) create mode 100644 presentations/2018-02-06_saferinternetday.tex delete mode 100644 presentations/alles-7-8kl-90min.tex delete mode 100644 presentations/alles-7-8kl-90min.yaml delete mode 100644 presentations/foej-workshop-180min.yaml delete mode 100644 presentations/saferinternetday.yaml diff --git a/presentations/16_06_22.yaml b/presentations/16_06_22.yaml deleted file mode 100644 index a82bce4..0000000 --- a/presentations/16_06_22.yaml +++ /dev/null @@ -1,6 +0,0 @@ -title: Digitale Selbstverteidigung -presenters: Marius -organization: Chaos Computer Club Dresden -date: 22.06.2016 - -deck: alles-7-8kl-90min.yaml diff --git a/presentations/16_12_13.yaml b/presentations/16_12_13.yaml deleted file mode 100644 index 27c1921..0000000 --- a/presentations/16_12_13.yaml +++ /dev/null @@ -1,6 +0,0 @@ -title: Chaos meets FÖJ -presenters: nac, vv0lf -organization: Chaos Computer club Dresden -date: 13.12.2016 - -deck: foej-workshop-180min.yaml diff --git a/presentations/17_05_20.yaml b/presentations/17_05_20.yaml deleted file mode 100644 index 40131fe..0000000 --- a/presentations/17_05_20.yaml +++ /dev/null @@ -1,6 +0,0 @@ -title: Einführung in sichere Kommunikation -presenters: Marius Melzer und Reiner Lübeck -organization: Chaos Computer Club Dresden, Medinetz Dresden -date: 20.05.2017 - -deck: medinetzkongress.yaml diff --git a/presentations/18_02_06.yaml b/presentations/18_02_06.yaml deleted file mode 100644 index dd3d1e3..0000000 --- a/presentations/18_02_06.yaml +++ /dev/null @@ -1,6 +0,0 @@ -title: Digitale Selbstverteidigung -presenters: Marius Melzer -organization: Chaos Computer Club Dresden -date: 06.02.2018 - -deck: saferinternetday.yaml diff --git a/presentations/2016-06-22_alles-7-8kl-90min.tex b/presentations/2016-06-22_alles-7-8kl-90min.tex new file mode 100644 index 0000000..d666fcf --- /dev/null +++ b/presentations/2016-06-22_alles-7-8kl-90min.tex @@ -0,0 +1,58 @@ +\documentclass{cms} +\title{Digitale Selbstverteidigung} +\author{Marius} +\date{22.06.2016} + +\begin{document} + +\section{Einleitung} + +\includedeck{ccc/ccc_bundesweit} +\includedeck{ccc/ccc_lokal} +\includedeck{motivation/stasi_vs_nsa} + +\section{Internet} + +\includedeck{internet/kommunikationsmodelle} +\includedeck{ccc/ccc_lokal} +\includedeck{internet/server_kabel_router} + +\section{Gerätesicherheit} + +\includedeck{geraetesicherheit/unerwuenschte_funktionalitaet} +\includedeck{geraetesicherheit/schutzmoeglichkeiten} +\includedeck{geraetesicherheit/app_permissions} +\includedeck{geraetesicherheit/foss_programme_apps} + +\section{Verschlüsselung} + +\includedeck{verschluesselung/tls} +\includedeck{verschluesselung/https_everywhere} +\includedeck{verschluesselung/e2e} +\includedeck{verschluesselung/messenger_vergleich} + +\section{Metadaten} + +\includedeck{metadaten/vds} +\includedeck{metadaten/location_heatmap} +\includedeck{metadaten/zeitstempel} +\includedeck{metadaten/antitracking} +\includedeck{metadaten/alternative_dienste} +\includedeck{metadaten/nextcloud} + +\section{Soziale Netzwerke} + +\includedeck{soziale_netzwerke/umfrage} +\includedeck{soziale_netzwerke/geschaeftsmodelleraten} +\includedeck{soziale_netzwerke/umgangsformen} + +\section{Verhalten} + +\includedeck{verhalten/datensparsamkeit} +\includedeck{verhalten/passwoerter} + +\section{Fazit} + +\includedeck{fazit/alles-7-8kl-90min} + +\end{document} \ No newline at end of file diff --git a/presentations/2016-12-13_foej-workshop-180min.tex b/presentations/2016-12-13_foej-workshop-180min.tex new file mode 100644 index 0000000..241c009 --- /dev/null +++ b/presentations/2016-12-13_foej-workshop-180min.tex @@ -0,0 +1,34 @@ +\documentclass{cms} +\title{Chaos meets FÖJ} +\author{nac, vv0lf} +\date{13.12.2016} + +\begin{document} + +\section{Einleitung} + +\includedeck{ccc/ccc_bundesweit} +\includedeck{ccc/ccc_lokal} +\includedeck{gruppen/fsfw} +\includedeck{internet/kommunikationsmodelle} +\includedeck{internet/kollektive} + +\section{Product Placement} + +\includedeck{tracking/tracking} +\includedeck{tracking/browser_fingerprinting} +\includedeck{wirtschaft/sharing-economy} + +\section{Datenschutz} + +\includedeck{motivation/freesoftware} +\includedeck{motivation/stasi_vs_nsa} + +\section{Gegenmaßnahmen} + +\includedeck{firefox/firefox_plugins} +\includedeck{internet/tor} +\includedeck{alternate/alternate} +\includedeck{geldfrei/geldfrei} + +\end{document} \ No newline at end of file diff --git a/presentations/medinetzkongress.tex b/presentations/2017-05-20_medinetzkongress.tex similarity index 100% rename from presentations/medinetzkongress.tex rename to presentations/2017-05-20_medinetzkongress.tex diff --git a/presentations/2018-02-06_saferinternetday.tex b/presentations/2018-02-06_saferinternetday.tex new file mode 100644 index 0000000..eef0574 --- /dev/null +++ b/presentations/2018-02-06_saferinternetday.tex @@ -0,0 +1,58 @@ +\documentclass{cms} +\title{Digitale Selbstverteidigung} +\author{Marius Melzer} +\date{06.02.2018} + +\begin{document} + +\section{Einleitung} + +\includedeck{ccc/ccc_bundesweit} +\includedeck{ccc/ccc_lokal} +\includedeck{motivation/stasi_vs_nsa} + +\section{Internet} + +\includedeck{internet/kommunikationsmodelle} +\includedeck{ccc/ccc_lokal} +\includedeck{internet/server_kabel_router} + +\section{Gerätesicherheit} + +\includedeck{geraetesicherheit/unerwuenschte_funktionalitaet} +\includedeck{geraetesicherheit/schutzmoeglichkeiten} +\includedeck{geraetesicherheit/app_permissions} +\includedeck{geraetesicherheit/foss_programme_apps} + +\section{Verschlüsselung} + +\includedeck{verschluesselung/tls} +\includedeck{verschluesselung/https_everywhere} +\includedeck{verschluesselung/e2e} +\includedeck{verschluesselung/messenger_vergleich} + +\section{Metadaten} + +\includedeck{metadaten/location_heatmap} +\includedeck{metadaten/zeitstempel} +\includedeck{metadaten/antitracking} +\includedeck{metadaten/alternative_dienste} +\includedeck{metadaten/nextcloud_weniger} + +\section{Soziale Netzwerke} + +\includedeck{soziale_netzwerke/umfrage} +\includedeck{soziale_netzwerke/geschaeftsmodelleraten} +\includedeck{soziale_netzwerke/ocean_modell} +\includedeck{soziale_netzwerke/umgangsformen} + +\section{Verhalten} + +\includedeck{verhalten/datensparsamkeit} +\includedeck{verhalten/passwoerter} + +\section{Fazit} + +\includedeck{fazit/alles-7-8kl-90min} + +\end{document} \ No newline at end of file diff --git a/presentations/alles-7-8kl-90min.tex b/presentations/alles-7-8kl-90min.tex deleted file mode 100644 index 247fbd7..0000000 --- a/presentations/alles-7-8kl-90min.tex +++ /dev/null @@ -1,72 +0,0 @@ -\section{Einleitung} -\subsection{} - -% ccc/ccc_bundesweit.tex -% ccc/ccc_lokal.tex -% motivation/stasi_vs_nsa.tex - -\section{Internet} -\subsection{} - -% internet/kommunikationsmodelle.tex -% internet/server_kabel_router.tex - -\section{Gerätesicherheit} -\subsection{} - -% geraetesicherheit/unerwuenschte_funktionalitaet.tex -% geraetesicherheit/schutzmoeglichkeiten.tex -% geraetesicherheit/app_permissions.tex -% geraetesicherheit/foss_programme_apps.tex - -\section{Verschlüsselung} -\subsection{} - -% verschluesselung/ssl.tex -% verschluesselung/https_everywhere.tex -% verschluesselung/e2e.tex -% verschluesselung/messenger_vergleich.tex - -\section{Metadaten} -\subsection{} - -% metadaten/vds.tex -% metadaten/location_heatmap.tex -% metadaten/zeitstempel.tex -% metadaten/antitracking.tex -% metadaten/alternative_dienste.tex -% metadaten/nextcloud.tex - -\section{Soziale Netzwerke} -\subsection{} - -% soziale_netzwerke/umfrage.tex -% soziale_netzwerke/geschaeftsmodelleraten.tex -% soziale_netzwerke/umgangsformen.tex - -\section{Verhalten} -\subsection{} - -% verhalten/datensparsamkeit.tex -% verhalten/passwoerter.tex - -\section{Fazit} -\subsection{} - -\begin{frame} - \frametitle{Fazit} - \begin{center} - \begin{itemize} - \item Wegverschlüsselung nutzen (auf HTTPS achten, Plugin: HTTPS Everywhere) - \item Ende-zu-Ende-Verschlüsselung nutzen (Email: GPG, Messenger: Signal) - \item Metadaten vermeiden (z.B. Alternative Dienste, Plugins: Privacy Badger oder Disconnect) - \item Soziale Netzwerke bewusst nutzen, auf Umgangsformen achten - \item Wichtig: Datenvermeidung und sichere Passwörter - \end{itemize} - - \vspace{5mm} - \href{https://github.com/cms/2016_05_04_kleinzschachwitz/}{Folien}: \href{https://creativecommons.org/licenses/by-sa/4.0/}{\cc{by-sa}} Chaos Computer Club Dresden \\ - \vspace{3mm} - CMS Dresden: schule@c3d2.de - \end{center} -\end{frame} diff --git a/presentations/alles-7-8kl-90min.yaml b/presentations/alles-7-8kl-90min.yaml deleted file mode 100644 index 3f7aa90..0000000 --- a/presentations/alles-7-8kl-90min.yaml +++ /dev/null @@ -1,41 +0,0 @@ -Einleitung: - - ccc/ccc_bundesweit.tex - - ccc/ccc_lokal.tex - - motivation/stasi_vs_nsa.tex - -Internet: - - internet/kommunikationsmodelle.tex - - ccc/ccc_lokal.tex - - internet/server_kabel_router.tex - -Gerätesicherheit: - - geraetesicherheit/unerwuenschte_funktionalitaet.tex - - geraetesicherheit/schutzmoeglichkeiten.tex - - geraetesicherheit/app_permissions.tex - - geraetesicherheit/foss_programme_apps.tex - -Verschlüsselung: - - verschluesselung/tls.tex - - verschluesselung/https_everywhere.tex - - verschluesselung/e2e.tex - - verschluesselung/messenger_vergleich.tex - -Metadaten: - - metadaten/vds.tex - - metadaten/location_heatmap.tex - - metadaten/zeitstempel.tex - - metadaten/antitracking.tex - - metadaten/alternative_dienste.tex - - metadaten/nextcloud.tex - -Soziale Netzwerke: - - soziale_netzwerke/umfrage.tex - - soziale_netzwerke/geschaeftsmodelleraten.tex - - soziale_netzwerke/umgangsformen.tex - -Verhalten: - - verhalten/datensparsamkeit.tex - - verhalten/passwoerter.tex - -Fazit: - - fazit/alles-7-8kl-90min.tex diff --git a/presentations/foej-workshop-180min.yaml b/presentations/foej-workshop-180min.yaml deleted file mode 100644 index e68a333..0000000 --- a/presentations/foej-workshop-180min.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Einleitung: - - ccc/ccc_bundesweit.tex - - ccc/ccc_lokal.tex - - gruppen/fsfw.tex - - internet/kommunikationsmodelle.tex - - internet/kollektive.tex - -Product Placement: - - tracking/tracking.tex - - tracking/browser_fingerprinting.tex - - wirtschaft/sharing-economy.tex - -Datenschutz: - - motivation/freesoftware.tex - - motivation/stasi_vs_nsa.tex - -Gegenmaßnahmen: - - firefox/firefox_plugins.tex - - internet/tor.tex - - alternate/alternate.tex - - geldfrei/geldfrei.tex diff --git a/presentations/saferinternetday.yaml b/presentations/saferinternetday.yaml deleted file mode 100644 index b5a34e5..0000000 --- a/presentations/saferinternetday.yaml +++ /dev/null @@ -1,41 +0,0 @@ -Einleitung: - - ccc/ccc_bundesweit.tex - - ccc/ccc_lokal.tex - - motivation/stasi_vs_nsa.tex - -Internet: - - internet/kommunikationsmodelle.tex - - ccc/ccc_lokal.tex - - internet/server_kabel_router.tex - -Gerätesicherheit: - - geraetesicherheit/unerwuenschte_funktionalitaet.tex - - geraetesicherheit/schutzmoeglichkeiten.tex - - geraetesicherheit/app_permissions.tex - - geraetesicherheit/foss_programme_apps.tex - -Verschlüsselung: - - verschluesselung/tls.tex - - verschluesselung/https_everywhere.tex - - verschluesselung/e2e.tex - - verschluesselung/messenger_vergleich.tex - -Metadaten: - - metadaten/location_heatmap.tex - - metadaten/zeitstempel.tex - - metadaten/antitracking.tex - - metadaten/alternative_dienste.tex - - metadaten/nextcloud_weniger.tex - -Soziale Netzwerke: - - soziale_netzwerke/umfrage.tex - - soziale_netzwerke/geschaeftsmodelleraten.tex - - soziale_netzwerke/ocean_modell.tex - - soziale_netzwerke/umgangsformen.tex - -Verhalten: - - verhalten/datensparsamkeit.tex - - verhalten/passwoerter.tex - -Fazit: - - fazit/alles-7-8kl-90min.tex From c9b073ddda406fb428d836e6d8cada4c9f93a297 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 20:25:42 +0200 Subject: [PATCH 09/25] Add Makefile --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4118c80 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +.ONESHELL: +presentations/%.pdf : presentations/%.tex + cd presentations + pdflatex $(notdir $<) + pdflatex $(notdir $<) From 3e3dded6ce7516930913c3321026d9c2a06d7699 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 20:25:48 +0200 Subject: [PATCH 10/25] Update README --- README.md | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c56c915..ec1d7bc 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,25 @@ # slidenado + Slide Generator, primarily for Chaos macht Schule ## Abhängigkeiten -* make -* ruby -* pdflatex (z.B. von texlive) +* `make` +* `pdflatex`, z.B. via TeXLive ## Nutzung -Die vorhandenen Vortrags-Konfigurationen werden mit `make` gebaut. +Alle Präsentation können direkt als LaTeX-Datei gebaut werden. Entweder eine +Datei in einem TeX-Editor der Wahl öffnen und dort übersetzen, oder auf der +Kommandozeile zum Beispiel folgendes aufrufen: + + cd presentations + pdflatex 2017-05-20_medinetzkongress.tex + +Alternativ kann auch das Makefile benutzt werden: + + make presentations/2017-05-20_medinetzkongress.pdf + +Präsentationen mit Notizen dazu können erzeugt werden, indem im Aufruf der +Dokumentenklasse als optionales Argument `notes` hinzugefügt wird. -Eigene Zusammenstellungen können in einem separaten Verzeichnis mithilfe der yaml-Dateien konfiguriiert werden. Als Anhalt bitte die vorhandenen decks verwenden. From bb5fb9de93a7aabae91a5e426e15c962d93f9229 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Wed, 8 Aug 2018 20:36:30 +0200 Subject: [PATCH 11/25] Mark dependency to make as optional --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec1d7bc..5589666 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Slide Generator, primarily for Chaos macht Schule ## Abhängigkeiten -* `make` * `pdflatex`, z.B. via TeXLive +* `make` (optional) ## Nutzung From 016902b6293f1c93af15711bec25344bf1c420f1 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 15:23:40 +0200 Subject: [PATCH 12/25] =?UTF-8?q?Add=20=E2=80=98all=E2=80=98=20rule=20to?= =?UTF-8?q?=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 4118c80..c8402d2 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +PRESENTATIONS=$(patsubst %.tex, %.pdf, $(wildcard presentations/*.tex)) + +all: ${PRESENTATIONS} + .ONESHELL: presentations/%.pdf : presentations/%.tex cd presentations From b14eaa7d090ef67bb1558deb67854df56d944274 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 15:40:27 +0200 Subject: [PATCH 13/25] =?UTF-8?q?Add=20=E2=80=98clean=E2=80=98=20rule=20to?= =?UTF-8?q?=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Makefile b/Makefile index c8402d2..4638c74 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,14 @@ PRESENTATIONS=$(patsubst %.tex, %.pdf, $(wildcard presentations/*.tex)) all: ${PRESENTATIONS} +clean: + rm -f presentations/*.log + rm -f presentations/*.out + rm -f presentations/*.nav + rm -f presentations/*.aux + rm -f presentations/*.snm + rm -f presentations/*.toc + .ONESHELL: presentations/%.pdf : presentations/%.tex cd presentations From 51ae3ad8646d0ee74f3613a5bed5cf4ed440f6e1 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 16:08:47 +0200 Subject: [PATCH 14/25] Store intermediate files in separate build directory --- .gitignore | 1 + Makefile | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8a53aa6..dc31fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ *.synctex.gz /presentations/*.pdf /presentations/auto +/presentations/build/ diff --git a/Makefile b/Makefile index 4638c74..e090685 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,23 @@ PRESENTATIONS=$(patsubst %.tex, %.pdf, $(wildcard presentations/*.tex)) +BUILD_DIR=build +BUILD_DECKS=$(subst presentations, presentations/$(BUILD_DIR), $(wildcard presentations/content/*)) +LATEX=pdflatex -output-directory $(BUILD_DIR) all: ${PRESENTATIONS} clean: - rm -f presentations/*.log - rm -f presentations/*.out - rm -f presentations/*.nav - rm -f presentations/*.aux - rm -f presentations/*.snm - rm -f presentations/*.toc + rm -fr presentations/$(BUILD_DIR) + +distclean: clean + rm -f presentations/*.pdf + +.SECONDARY: $(BUILD_DECKS) +presentations/$(BUILD_DIR)/%: + mkdir -p $@ .ONESHELL: -presentations/%.pdf : presentations/%.tex +presentations/%.pdf : presentations/%.tex $(BUILD_DECKS) cd presentations - pdflatex $(notdir $<) - pdflatex $(notdir $<) + $(LATEX) $(notdir $<) + $(LATEX) $(notdir $<) + mv $(BUILD_DIR)/$*.pdf . From 802e0abbb93c733fbaa3ee56553b0f0fe4592fc8 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 16:37:01 +0200 Subject: [PATCH 15/25] Rewrite pattern rule with templates --- Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e090685..08f9f18 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,14 @@ distclean: clean presentations/$(BUILD_DIR)/%: mkdir -p $@ -.ONESHELL: -presentations/%.pdf : presentations/%.tex $(BUILD_DECKS) +define PRESENTATION_template +.ONESHELL: $(1) +$(1): $(subst .pdf,.tex,$(1)) $(BUILD_DECKS) cd presentations - $(LATEX) $(notdir $<) - $(LATEX) $(notdir $<) - mv $(BUILD_DIR)/$*.pdf . + $(LATEX) $$(notdir $$<) + $(LATEX) $$(notdir $$<) + mv $(subst presentations/,$(BUILD_DIR)/,$(1)) . +endef + +$(foreach presentation, $(PRESENTATIONS), \ + $(eval $(call PRESENTATION_template, $(presentation)))) From f6856745487307f3eebe7fc12ea175014f9d2d4e Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 16:46:01 +0200 Subject: [PATCH 16/25] Makefile how has dynamic dependencies for each presentation The dependencies are read from each LaTeX file by searching for calls to \includedeck. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 08f9f18..767e248 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,14 @@ distclean: clean presentations/$(BUILD_DIR)/%: mkdir -p $@ +define presentation_dependencies + $(shell cat $(1) | perl -ne '/includedeck\{(.*)\}/ && print "presentations/content/", $$1, ".tex "') +endef + define PRESENTATION_template .ONESHELL: $(1) -$(1): $(subst .pdf,.tex,$(1)) $(BUILD_DECKS) +$(1): $(subst .pdf,.tex,$(1)) $(call presentation_dependencies,$(subst .pdf,.tex,$(1))) + echo $$^ cd presentations $(LATEX) $$(notdir $$<) $(LATEX) $$(notdir $$<) From d45a004e7a38bb5c1fc1871fb6c3120fd5233bfa Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:02:51 +0200 Subject: [PATCH 17/25] =?UTF-8?q?No=20need=20to=20use=20=E2=80=98cat?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 767e248..1490993 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ presentations/$(BUILD_DIR)/%: mkdir -p $@ define presentation_dependencies - $(shell cat $(1) | perl -ne '/includedeck\{(.*)\}/ && print "presentations/content/", $$1, ".tex "') + $(shell perl -ne '/includedeck\{(.*)\}/ && print "presentations/content/", $$1, ".tex "' $(1)) endef define PRESENTATION_template From 27d66a7b58ca4d0dc6c5dbffa43a3193b1c81b71 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:03:00 +0200 Subject: [PATCH 18/25] Some comments for the Makefile --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 1490993..89d58df 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,27 @@ clean: distclean: clean rm -f presentations/*.pdf +# A rule to make build directories when needed; the call to .SECONDARY ensures +# that these directories are not deleted when they are generated as intermediate +# targets + .SECONDARY: $(BUILD_DECKS) presentations/$(BUILD_DIR)/%: mkdir -p $@ +# Extract dependencies for presentations by looking at the source code and +# extracting all calls to \includedeck from them; it returns a list of elements +# like ’presentations/content/ccc/ccc_lokal.tex’ + define presentation_dependencies $(shell perl -ne '/includedeck\{(.*)\}/ && print "presentations/content/", $$1, ".tex "' $(1)) endef +# This template is called with arguments like ‘presentation/xxx.pdf’; it +# generates a rule that dependes on the corresponding tex file as well as on all +# decks used in that tex file; dependencies are of the form +# ‘content/ccc/ccc_lokal.tex’ + define PRESENTATION_template .ONESHELL: $(1) $(1): $(subst .pdf,.tex,$(1)) $(call presentation_dependencies,$(subst .pdf,.tex,$(1))) From 82b6ee3274d2dc7539f2a65f08ace95d0603081f Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:40:27 +0200 Subject: [PATCH 19/25] Simplify generation of build directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Just make it, don’t look on the exact dependencies of the current presentation. --- Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 89d58df..1803f51 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PRESENTATIONS=$(patsubst %.tex, %.pdf, $(wildcard presentations/*.tex)) BUILD_DIR=build -BUILD_DECKS=$(subst presentations, presentations/$(BUILD_DIR), $(wildcard presentations/content/*)) +BUILD_DECKS=$(subst presentations/,$(BUILD_DIR)/,$(wildcard presentations/content/*)) LATEX=pdflatex -output-directory $(BUILD_DIR) all: ${PRESENTATIONS} @@ -11,14 +11,6 @@ clean: distclean: clean rm -f presentations/*.pdf -# A rule to make build directories when needed; the call to .SECONDARY ensures -# that these directories are not deleted when they are generated as intermediate -# targets - -.SECONDARY: $(BUILD_DECKS) -presentations/$(BUILD_DIR)/%: - mkdir -p $@ - # Extract dependencies for presentations by looking at the source code and # extracting all calls to \includedeck from them; it returns a list of elements # like ’presentations/content/ccc/ccc_lokal.tex’ @@ -37,6 +29,7 @@ define PRESENTATION_template $(1): $(subst .pdf,.tex,$(1)) $(call presentation_dependencies,$(subst .pdf,.tex,$(1))) echo $$^ cd presentations + mkdir -p $(BUILD_DECKS) $(LATEX) $$(notdir $$<) $(LATEX) $$(notdir $$<) mv $(subst presentations/,$(BUILD_DIR)/,$(1)) . From 50725deb15a9867e1b721579a10a44ec7d3c8891 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:41:04 +0200 Subject: [PATCH 20/25] A Makefile disclaimer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think it’s in order ;) --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 1803f51..93bffa7 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +# Note: this whole makefile is a huge hack, is highly unportable, and probably +# won’t even do what it’s supposed to do. So, use with care, have fun :) + PRESENTATIONS=$(patsubst %.tex, %.pdf, $(wildcard presentations/*.tex)) BUILD_DIR=build BUILD_DECKS=$(subst presentations/,$(BUILD_DIR)/,$(wildcard presentations/content/*)) From 442b67ec6e8c1ae065ac55f50a786e0920aed82f Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:41:29 +0200 Subject: [PATCH 21/25] A dummy rule for all tex files in the decks Rationale: we can later add image dependencies here. --- Makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 93bffa7..e249ef2 100644 --- a/Makefile +++ b/Makefile @@ -40,3 +40,18 @@ endef $(foreach presentation, $(PRESENTATIONS), \ $(eval $(call PRESENTATION_template, $(presentation)))) + +# This template is called with a single argument like +# ‘presentations/content/ccc/ccc_bundesweit.tex’; it generates a rule that does +# nothing so far. In the future, it could depende on all images used by the tex +# file. + +define DECK_template +$(1): + : +endef + +# Files contained in decks are only considered in the top-level directory + +$(foreach deck, $(wildcard presentations/content/*/*.tex), \ + $(eval $(call DECK_template, $(deck)))) From bf7b973acc03b5067bf2b7cdf260369a986feb75 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:54:57 +0200 Subject: [PATCH 22/25] Depend on image files in Makefile For this to work, all images included in tex files must be given with their file suffix. For this reason, I also had to update some of these text files. --- Makefile | 10 +++++----- presentations/content/alternate/alternate.tex | 2 +- .../content/geraetesicherheit/foss_programme_apps.tex | 2 +- .../unerwuenschte_funktionalitaet.tex | 2 +- presentations/content/motivation/freesoftware.tex | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index e249ef2..d0c3f5f 100644 --- a/Makefile +++ b/Makefile @@ -42,13 +42,13 @@ $(foreach presentation, $(PRESENTATIONS), \ $(eval $(call PRESENTATION_template, $(presentation)))) # This template is called with a single argument like -# ‘presentations/content/ccc/ccc_bundesweit.tex’; it generates a rule that does -# nothing so far. In the future, it could depende on all images used by the tex -# file. +# ‘presentations/content/ccc/ccc_bundesweit.tex’; it generates a rule that +# dependes on all images used by the tex file. The actual recipe just checks +# whether the tex file is existent and updates the timestamp. define DECK_template -$(1): - : +$(1): $(shell perl -ne '/includegraphics[^\{]*\{([^\}]*)\}/ && print "presentations/", $$1, " "' $(1)) + test -f $(1) && touch $(1) endef # Files contained in decks are only considered in the top-level directory diff --git a/presentations/content/alternate/alternate.tex b/presentations/content/alternate/alternate.tex index b2f9c9d..aae9ae3 100644 --- a/presentations/content/alternate/alternate.tex +++ b/presentations/content/alternate/alternate.tex @@ -94,7 +94,7 @@ Plattformübergreifende Synchronisierung von Dateien, Dokumenten, Kalendern, Kon \includegraphics{img/fdroid.png} \column{5cm} \begin{center} - \includegraphics[width=2cm]{img/F-Droid_Logo_2} + \includegraphics[width=2cm]{img/F-Droid_Logo_2.pdf} \par\end{center} \begin{center} \par diff --git a/presentations/content/geraetesicherheit/foss_programme_apps.tex b/presentations/content/geraetesicherheit/foss_programme_apps.tex index 4096d12..d6f6db2 100644 --- a/presentations/content/geraetesicherheit/foss_programme_apps.tex +++ b/presentations/content/geraetesicherheit/foss_programme_apps.tex @@ -39,7 +39,7 @@ \column{5cm} \begin{center} - \includegraphics[width=2cm]{img/F-Droid_Logo_2} + \includegraphics[width=2cm]{img/F-Droid_Logo_2.pdf} \par\end{center} \begin{center} \par\end{center} diff --git a/presentations/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex b/presentations/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex index 0d0921c..5855b55 100644 --- a/presentations/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex +++ b/presentations/content/geraetesicherheit/unerwuenschte_funktionalitaet.tex @@ -10,7 +10,7 @@ \begin{frame} \frametitle{Unerwünschte Funktionalität} \begin{center} - \includegraphics[width=7cm]{img/backdoor-apps} + \includegraphics[width=7cm]{img/backdoor-apps.png} \par\end{center} \end{frame} diff --git a/presentations/content/motivation/freesoftware.tex b/presentations/content/motivation/freesoftware.tex index be9221c..54d0e83 100644 --- a/presentations/content/motivation/freesoftware.tex +++ b/presentations/content/motivation/freesoftware.tex @@ -31,11 +31,11 @@ \column{7cm} \begin{center} - \includegraphics[width=4.5cm]{img/stallman} + \includegraphics[width=4.5cm]{img/stallman.jpg} \par\end{center} \begin{center} - \includegraphics[width=5cm]{img/logo-fsf} + \includegraphics[width=5cm]{img/logo-fsf.pdf} \par\end{center} \end{columns} \end{frame} @@ -79,7 +79,7 @@ \column{5cm} \begin{center} - \includegraphics[width=2cm]{img/F-Droid_Logo_2} + \includegraphics[width=2cm]{img/F-Droid_Logo_2.pdf} \par\end{center} \begin{center} \par\end{center} From 8dcbb43ba473adcdc9d37c4b582201b0f48f5e54 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 17:57:34 +0200 Subject: [PATCH 23/25] Update some comments in Makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d0c3f5f..e68b2d6 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ distclean: clean # extracting all calls to \includedeck from them; it returns a list of elements # like ’presentations/content/ccc/ccc_lokal.tex’ +# Yes, we are using perl: a system that has make probably also has perl; if not, +# blame me. + define presentation_dependencies $(shell perl -ne '/includedeck\{(.*)\}/ && print "presentations/content/", $$1, ".tex "' $(1)) endef @@ -51,7 +54,7 @@ $(1): $(shell perl -ne '/includegraphics[^\{]*\{([^\}]*)\}/ && print "presentati test -f $(1) && touch $(1) endef -# Files contained in decks are only considered in the top-level directory +# Files contained in decks are only considered at top-level. $(foreach deck, $(wildcard presentations/content/*/*.tex), \ $(eval $(call DECK_template, $(deck)))) From 1a4b17213a677eb421769313ec63d3f988df4d46 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 18:11:44 +0200 Subject: [PATCH 24/25] Replace braces for parentheses --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e68b2d6..71dc3c9 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ BUILD_DIR=build BUILD_DECKS=$(subst presentations/,$(BUILD_DIR)/,$(wildcard presentations/content/*)) LATEX=pdflatex -output-directory $(BUILD_DIR) -all: ${PRESENTATIONS} +all: $(PRESENTATIONS) clean: rm -fr presentations/$(BUILD_DIR) From e4436ac2b6996908317e9675e482dd79487000d7 Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 19 Aug 2018 18:12:05 +0200 Subject: [PATCH 25/25] Fix comment --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 71dc3c9..c654324 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,10 @@ define presentation_dependencies $(shell perl -ne '/includedeck\{(.*)\}/ && print "presentations/content/", $$1, ".tex "' $(1)) endef -# This template is called with arguments like ‘presentation/xxx.pdf’; it +# This template is called with arguments like ‘presentations/xxx.pdf’; it # generates a rule that dependes on the corresponding tex file as well as on all # decks used in that tex file; dependencies are of the form -# ‘content/ccc/ccc_lokal.tex’ +# ‘presentations/content/ccc/ccc_lokal.tex’ define PRESENTATION_template .ONESHELL: $(1)