Fixed analytics and custom slide code

markushuber · markushuber · commit 2585f8fd930a · 2024-09-27T11:34:29.000+02:00
diff --git a/config.toml b/config.toml
@@ -27,8 +27,8 @@ summaryLength = 30
     weight = 2
 
 [params]
-  matomo_analytics_id=""
-  matomo_anyltics_host="https://matomo.nysos.net"
+  matomo_analytics_id="11"
+  matomo_analytics_host="//matomo.nysos.net/"
   homepage_button_link = '/course'
   homepage_button_text = 'Content'
   homepage_intro = 'Privacy-Enhancing Techologies Lecture Archive'
diff --git a/content/course/slides/index.md b/content/course/slides/index.md
@@ -4,29 +4,44 @@ date: 2024-09-24
 weight: 2
 summary: 'PDF Slides based on our PETS lecture from late 2023.'
 ---
-The following slides are based on our last PETS course ([194.144@TU Wien](https://tiss.tuwien.ac.at/course/educationDetails.xhtml?dswid=9857&dsrid=946&semester=2023W&courseNr=194144)) from late 2023.
+The following slides in format are based on our last PETS course from late 2023 (see [194.144@TU Wien](https://tiss.tuwien.ac.at/course/educationDetails.xhtml?dswid=9857&dsrid=946&semester=2023W&courseNr=194144)).
 
 ### Topics
 
-#### 01_Introduction.pdf [-> pdf](/slides/01_Introduction.pdf)
-`introduction`, `motivation`
+{{< slide file_name="01_Introduction.pdf" >}}
+`introduction`, `motivation`, `non-technical aspects`
+
+
+{{< slide file_name="02_Anonymity.pdf" >}}
 
-#### [02_Anonymity.pdf](/slides/02_Anonymity.pdf)
-Systems for online anonymity (remailer, dining cryptographers, mix networks)
 `remailer`, `chaum mixes`, `mix networks`
 
-#### [03_Censorship.pdf](/slides/03_Censorship.pdf)
-Internet censorship (technologies, measurements, circumvention, Great Firewall of China)
 
-#### [04_Messaging.pdf](/slides/04_Messaging.pdf)
-Secure Messaging (PGP, OTR, ZRTP, mobile messaging, Signal)
+{{< slide file_name="03_Censorship.pdf" >}}
+
+`censorship technologies`, `circumvention`, `measurements`
+
+
+{{< slide file_name="04_Messaging.pdf" >}}
+
+`pgp`, `mobile messaging`, `signal`
+
+
+{{< slide file_name="05_TLS.pdf" >}}
+
+`transport layer security`, `public key infrastructure`, `https`
+
+
+{{< slide file_name="06_Tor.pdf" >}}
+
+`onion routing`, `hidden services`, `attacks`
+
+
+{{< slide file_name="07_WebPrivacy.pdf" >}}
 
-#### [05_TLS.pdf](/slides/05_TLS.pdf)
-Transport Layer Security (TLS, PKI, Implementations, Crypto, HTTPS, attacks, incidents, HSTS, CT, DNS over TLS/HTTPS)
+`web tracking`, `fingerprinting`, `dns privacy`
 
-#### [06_Tor.pdf](/slides/06_Tor.pdf)
-Tor (onion routing, functionality, onion services, attacks, usage)
 
-#### [07_WebPrivacy.pdf](/slides/07_WebPrivacy.pdf)
-Web Privacy (web tracking, fingerprinting, anti tracking)
+{{< slide file_name="08_VPNs.pdf" >}}
 
+`tls-based`, `wireguard`, `alternatives`
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="{{ .Site.Language.Lang }}">
-
+{{ partial "matomo.html" . }}
 <head>
   <meta charset="utf-8">
   <meta http-equiv="x-ua-compatible" content="ie=edge">
@@ -66,8 +66,6 @@
   <script type="text/javascript" src="{{ ($scripts | minify | fingerprint).RelPermalink }}"></script>
   {{ end }}
 
-  {{ partial "matomo.html" . }}
-
 </body>
 
 </html>
diff --git a/layouts/partials/matomo.html b/layouts/partials/matomo.html
@@ -1,8 +1,4 @@
-{{- if hugo.IsServer -}}
-  <!-- Dont add Matomo to localhost -->
-{{ else }}
-  {{ $mid := (getenv "HUGO_MATOMO_ANALYTICS_ID") }}
-  {{ if $mid }}
+  {{ if .Site.Params.matomo_analytics_id }}
     <!-- Matomo -->
     <script>
       var _paq = window._paq = window._paq || [];
@@ -12,10 +8,9 @@
       (function() {
         var u="{{ .Site.Params.matomo_analytics_host }}";
         _paq.push(['setTrackerUrl', u+'matomo.php']);
-        _paq.push(['setSiteId', '{{ $mid }}']);
+        _paq.push(['setSiteId', '{{ .Site.Params.matomo_analytics_id }}']);
         var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
         g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
       })();
     </script>
-  {{ end}}
-{{ end }}
+  {{ end }}
diff --git a/layouts/shortcodes/slide.html b/layouts/shortcodes/slide.html
@@ -0,0 +1,5 @@
+{{ $filepath := (printf "static/slides/%s" (.Get `file_name`)) }}
+{{ $file := os.Stat $filepath }}
+{{ $file_size_in_mb := (printf "%.2f" (div $file.Size 1000000.0)) }}
+
+<h2><a href="/slides/{{.Get `file_name` }}">{{ path.BaseName $filepath }}</a><span style="font-size: 1rem;"> PDF ({{ $file_size_in_mb}} MB)</span></h2>
