add fw-new

hosts/web-arm/configuration.nix

@@ -55,6 +55,8 @@
     davfs2
     screen
     ucommon
+    php
+    php83
   ];
   services.davfs2.enable = true;
 

hosts/web-arm/modules/prometheus.nix

@@ -137,6 +137,18 @@
             ];
             labels.host = "web-01.cloonar.com";
           }
+          {
+            targets = [
+              "web-arm.cloonar.com:9273"
+            ];
+            labels.host = "web-arm.cloonar.com";
+          }
+          {
+            targets = [
+              "fw.cloonar.com:9273"
+            ];
+            labels.host = "fw.cloonar.com";
+          }
           {
             targets = [
               "mail.cloonar.com:9273"
@@ -158,6 +170,8 @@
           {
             targets = map (host: "${host}.cloonar.com:9273") [
               "web-01"
+              "web-arm"
+              "fw"
               "mail"
               "git"
               "home-assistant"

hosts/web-arm/modules/victoriametrics.nix

@@ -2,11 +2,11 @@
 let
   configure_prom = builtins.toFile "prometheus.yml" ''
     scrape_configs:
-    - job_name: '${config.networking.hostName}'
+    - job_name: 'server'
       stream_parse: true
       static_configs:
       - targets:
-        - 127.0.0.1:9100
+        - ${config.networking.hostName}:9100
   '';
 in {
   services.prometheus.exporters.node.enable = true;

hosts/web-arm/modules/web/typo3.nix

@@ -185,7 +185,7 @@ in
       forceSSL = true;
       enableACME = true;
       acmeRoot = null;
-      root = cfg.dataDir + "/" + domain + "/public";
+      root = cfg.dataDir + "/" + domain + "/current/public";
       serverAliases = instanceOpts.domainAliases;
 
       extraConfig = ''

hosts/web-arm/sites/gbv-aktuell.at.nix

@@ -5,35 +5,6 @@
     authorizedKeys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHYyLbVv9l/LhpNhmE3QO0f9Lg8d2Y8JiDdn/cNcmyfO"
     ];
-    phpPackage = pkgs.php81;
+    phpPackage = pkgs.php83;
   };
-
-  services.awstats = {
-      enable = true;
-      updateAt = "daily";
-      configs."gbv-aktuell.at" = {
-        webService = {
-          enable = true;
-          hostname = "gbv-aktuell.at";
-        };
-        logFile = "/var/log/nginx/access.log";
-        extraConfig = {
-          # ShowDaysOfWeekStats = "0";
-          # ShowHoursStats = "0";
-          # ShowDomainsStats = "0";
-          # ShowHostsStats = "0";
-          # "ShowRobotsStats" = "0";
-          # "ShowFileTypesStats" = "0";
-          # "ShowDownloadsStats" = "0";
-          # "ShowPagesStats" = "0";
-          # "ShowOSStats" = "0";
-          # "ShowBrowsersStats" = "0";
-          # "ShowOriginStats" = "0";
-          # "ShowKeyphrasesStats" = "0";
-          # "ShowKeywordsStats" = "0";
-          # "ShowMiscStats" = "0";
-          # "ShowHTTPErrorsStats" = "0";
-        };
-      };
-    };
 }

hosts/web-arm/sites/gbv-aktuell.cloonar.dev.nix

@@ -5,6 +5,6 @@
     authorizedKeys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAcDedq/yqC2ROzvZGTyR/tDSnTcL3LB32O2QhkgQmfn"
     ];
-    phpPackage = pkgs.php81;
+    phpPackage = pkgs.php83;
   };
 }