Fix 19.09

hosts/hera/cloud.nix

@@ -16,8 +16,10 @@ let
     privateNetwork = true;
     hostBridge = "bridge";
     config = { pkgs, ... }: {
-      disabledModules = [ "services/web-apps/nextcloud.nix" ];
-      imports = [ ../../system ./nextcloud.nix ];
+      #disabledModules = [ "services/web-apps/nextcloud.nix" ];
+      imports = [
+        ../../system # ./nextcloud.nix
+      ];
 
       networking = {
         interfaces.eth0 = {
@@ -130,6 +132,9 @@ in {
           proxyPass = "http://chor-cloud";
           extraConfig = "proxy_set_header Host $host;";
         };
+        extraConfig = ''
+          more_set_headers "Content-Security-Policy: frame-ancestors 'self' https://*.mathechor.de";
+        '';
       };
     };
   };

system/matrix-synapse.nix

@@ -78,7 +78,7 @@ in {
       '';
       database_args = {
         user = "matrix-synapse";
-        host = "/tmp";
+        #host = "/tmp";
         database = "matrix-synapse";
         cp_min = 5;
         cp_max = 10;

system/monitoring/default.nix

@@ -73,9 +73,6 @@ in {
           }];
         };
       };
-    };
-
-    prometheus2 = {
       enable = true;
       ruleFiles = [ ./rules.yml ];
       scrapeConfigs = [
@@ -107,7 +104,8 @@ in {
           }) config.m-0.monitoring;
         }
       ];
-      alertmanagerURL = [ "localhost:9093" ];
+      alertmanagers =
+        [{ static_configs = [{ targets = [ "localhost:9093" ]; }]; }];
     };
   };
 }

system/monitoring/rules.yml

@@ -11,7 +11,7 @@ groups:
              description: '{{ $labels.name }} has been down for more than 5 minutes.'
              summary: '{{$labels.name}}: Node is down.'
         - alert: systemd_service_failed
-          expr: node_systemd_unit_state{state="failed"} == 1
+          expr: node_systemd_unit_state{state="failed", exported_name!="disable-transparent-huge-pages.service"} == 1
           for: 4m
           annotations:
              description: '{{$labels.name}} failed to (re)start service {{$labels.exported_name}}.'