From 91106240a9375b941571842b718a9d41d9d4774e Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Mon, 13 Jan 2020 10:46:53 +0100
Subject: [PATCH] Move matomo code to seperate script to ease implementing
 Content-Security-Policy header.

---
 assets/js/tracking.js        | 13 +++++++++++++
 layouts/partials/matomo.html | 15 +++------------
 2 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 assets/js/tracking.js

diff --git a/assets/js/tracking.js b/assets/js/tracking.js
new file mode 100644
index 0000000..064e2e2
--- /dev/null
+++ b/assets/js/tracking.js
@@ -0,0 +1,13 @@
+/**
+ * @file
+ * A JavaScript file for matomo analytic tracking.
+ */
+
+var idSite = {{ .Site.Params.piwikSiteID }};
+var matomoTrackingApiUrl = 'https://{{ .Site.Params.piwikTrackerUrl }}/matomo.php';
+
+var _paq = window._paq || [];
+_paq.push(['setTrackerUrl', matomoTrackingApiUrl]);
+_paq.push(['setSiteId', idSite]);
+_paq.push(['trackPageView']);
+_paq.push(['enableLinkTracking']);
diff --git a/layouts/partials/matomo.html b/layouts/partials/matomo.html
index ce3ea2b..bb4360f 100644
--- a/layouts/partials/matomo.html
+++ b/layouts/partials/matomo.html
@@ -1,14 +1,5 @@
 {{ if and .Site.Params.piwikTrackerUrl .Site.Params.piwikSiteID -}}
-<script>
-  var _paq = window._paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://{{ .Site.Params.piwikTrackerUrl }}/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '{{ .Site.Params.piwikSiteID }}']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
+{{ $script := resources.Get "js/tracking.js" | resources.ExecuteAsTemplate "js/tracking.js" . | minify | fingerprint -}}
+<script src="{{ $script.RelPermalink }}"></script>
+<script defer src="https://{{ .Site.Params.piwikTrackerUrl }}/matomo.js"></script>
 {{ end -}}