Merge branch 'carpentries-main'

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: varnish
 Title: Front-end for The Carpentries Lesson Infrastructure
-Version: 1.0.2-1
+Version: 1.0.3.9000-1
 Authors@R: c(
     person(given = "Zhian N.",
            family = "Kamvar",

NEWS.md

@@ -1,3 +1,14 @@
+# varnish 1.0.3.9000 (2023-05-28)
+
+## NEW FEATURES
+
+* Add config.yaml configuration option `analytics` to support
+  inclusion of the Carpentries Matomo web analytics tracking script,
+  a user-supplied tracking script a la Google, or no option to turn
+  off tracking (reported: @fiveop https://github.com/carpentries/varnish/issues/37,
+  implemented @froggleston)
+
+
 # varnish 1.0.2 (2023-04-10)
 
 ## NEW FEATURES

inst/pkgdown/templates/footer.html

@@ -21,26 +21,7 @@
 	<script>
 		feather.replace();
 	</script>
-  <!-- Matomo
-    2022-11-07: we have gotten a notification that we have an overage for our
-    tracking and I'm pretty sure this has to do with Workbench usage.
-    Considering that I am not _currently_ using this tracking because I do not
-    yet know how to access the data, I am turning this off for now.
-  <script>
-    var _paq = window._paq = window._paq || [];
-    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-    _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-    _paq.push(["setDomains", ["*.preview.carpentries.org","*.datacarpentry.github.io","*.datacarpentry.org","*.librarycarpentry.github.io","*.librarycarpentry.org","*.swcarpentry.github.io", "*.carpentries.github.io"]]);
-    _paq.push(["setDoNotTrack", true]);
-    _paq.push(["disableCookies"]);
-    _paq.push(['trackPageView']);
-    _paq.push(['enableLinkTracking']);
-    (function() {
-          var u="https://carpentries.matomo.cloud/";
-          _paq.push(['setTrackerUrl', u+'matomo.php']);
-          _paq.push(['setSiteId', '1']);
-          var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-          g.async=true; g.src='https://cdn.matomo.cloud/carpentries.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
-        })();
-  </script>
-  End Matomo Code -->
+
+  {{#analytics}}
+  {{& analytics}}
+  {{/analytics}}