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

flyingcircusio · May 9, 2023 · 493bdda · 493bdda
2 parents 16ad43b + 1a5430d
commit 493bdda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix
@@ -45,10 +45,10 @@ in {
     (mkRemovedOptionModule [ "flyingcircus" "roles" "loghost" "enable" ] "Last platform version that supported graylog/loghost was 22.05.")
     (mkRemovedOptionModule [ "flyingcircus" "roles" "loghost-location" "enable" ] "Last platform version that supported graylog/loghost was 22.05.")
     (mkRemovedOptionModule [ "flyingcircus" "roles" "mysql" "rootPassword" ] "Change the root password via MySQL and modify secret files.")
-    (mkRemovedOptionModule [ "flyingcircus" "roles" "statshost" "enable" ] "Use flyingcircus.roles.statshost-global.enable instead.")
     (mkRemovedOptionModule [ "flyingcircus" "roles" "statshostproxy" "enable" ] "Use flyingcircus.roles.statshost-location-proxy.enable instead.")
 
     # Renamed
+    (mkRenamedOptionModule [ "flyingcircus" "roles" "statshost" "enable" ] [ "flyingcircus" "roles" "statshost-global" "enable" ])
     (mkRenamedOptionModule [ "flyingcircus" "roles" "elasticsearch" "dataDir" ] [ "services" "elasticsearch" "dataDir" ])
     (mkRenamedOptionModule [ "flyingcircus" "roles" "statshost" "globalAllowedMetrics" ] [ "flyingcircus" "roles" "statshost-global" "allowedMetricPrefixes" ])
   ];

diff --git a/nixos/services/matomo.nix b/nixos/services/matomo.nix
@@ -563,6 +563,12 @@ in {
         locations."= /piwik.js".extraConfig = ''
           expires 1M;
         '';
+        # Alias for the previous Tag Manager container location which
+        # may still be in use by tracked applications because the old
+        # path is embedded in the tracking code.
+        locations."/js/tagmanager/" = {
+            alias = "${jsDir}/";
+        };
       }];
     };
   };