Merge branch 'fc-22.11-dev' into fc-22.11-staging

flyingcircusio · May 12, 2023 · 481d464 · 481d464
2 parents b0e6f96 + d0111b1
commit 481d464
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/nixos/services/matomo.nix b/nixos/services/matomo.nix
@@ -539,6 +539,13 @@ in {
         locations."= /piwik.php".extraConfig = ''
           fastcgi_pass unix:${fpm.socket};
         '';
+        # Alternative path for the tracking API (matomo.php) AND matomo.js.
+        # See https://github.com/matomo-org/matomo/blob/4.x-dev/js/README.md
+        # index.php can also be left out in the call, just using `/js?action_name=...` will
+        # also use index.php.
+        locations."= /js/index.php".extraConfig = ''
+          fastcgi_pass unix:${fpm.socket};
+        '';
         # Any other attempt to access any php files is forbidden
         locations."~* ^.+\\.php$".extraConfig = ''
           return 403;

diff --git a/versions.json b/versions.json
@@ -2,9 +2,9 @@
   "nixpkgs": {
     "owner": "flyingcircusio",
     "repo": "nixpkgs",
-    "rev": "63572e7d205027d8ae4bed36f1d5b166ae620d14",
-    "sha256": "pJ9W+jBwHog5dB3nzozejUQB2ElEGPYfecja3ejVSz8="
-  },
+    "rev": "68d3f0e2ec7d290b8686be9df2455c5e25995324",
+    "sha256": "RfRXjA8FTuX2V1jqKjgcVAU/vZuLcOWIRDfKjloTgWk="
+   },
   "nixos-mailserver": {
     "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/",
     "rev": "02186744a7d8309d92f5b17689ee5184d87b4f2e",