Merge remote-tracking branch 'refs/remotes/origin/main'

chnm · Nov 19, 2024 · 05a1d10 · 05a1d10
2 parents 0f374d7 + c12ba41
commit 05a1d10
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -4,9 +4,12 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - "main"
+      - "**"
     paths:
       - "**"
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
 
 jobs:
   build-publish:

diff --git a/templates/base.html b/templates/base.html
@@ -25,6 +25,23 @@
         <link rel="stylesheet" href="{% static 'css/custom.css' %}" />
         <script src="{% static 'js/denig.js' %}"></script>
         {% block extrahead %}{% endblock extrahead %}
+
+        <!-- Matomo -->
+        <script>
+            var _paq = window._paq = window._paq || [];
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            (function() {
+                var u="https://stats.rrchnm.org/";
+                _paq.push(['setTrackerUrl', u+'matomo.php']);
+                _paq.push(['setSiteId', '117']);
+                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 Matomo Code -->
+
     </head>
 
     <body class="font-serif">
@@ -128,4 +145,4 @@
         </footer>
     </body>
 
-</html>
+</html>