hosts/web-2: postgresql migrate to ensureDBOwnership

hosts/storage-2/syncthing.nix

@@ -3,18 +3,20 @@
 {
   services.syncthing = {
     enable = true;
-    devices = {
-      ceasium = { id = "3JVJ2KS-C44JKLL-LFIMCVJ-VUQK2VB-WKJNOGB-4AIJYJM-MINXEKG-T5FHQQE"; };
-      ev0 = { id = "XLZNAIG-Q5BJYXZ-IJWS3RD-EOETGFI-265U5MH-U4VBEXX-KC6MWPH-B22ROQT"; };
-    };
-    folders = {
-      mixcloud = {
-        path = "/data/mixcloud";
-        type = "sendonly";
-        devices = [
-          "ceasium"
-          "ev0"
-        ];
+    settings = {
+      devices = {
+        ceasium = { id = "3JVJ2KS-C44JKLL-LFIMCVJ-VUQK2VB-WKJNOGB-4AIJYJM-MINXEKG-T5FHQQE"; };
+        ev0 = { id = "XLZNAIG-Q5BJYXZ-IJWS3RD-EOETGFI-265U5MH-U4VBEXX-KC6MWPH-B22ROQT"; };
+      };
+      folders = {
+        mixcloud = {
+          path = "/data/mixcloud";
+          type = "sendonly";
+          devices = [
+            "ceasium"
+            "ev0"
+          ];
+        };
       };
     };
   };

hosts/web-2/chaosevents.nix

@@ -22,6 +22,7 @@
 
   systemd.services."chaosevents" = {
     wantedBy = [ "multi-user.target" ];
+    requires = [ "network.target" ];
     after = [ "network.target" ];
     serviceConfig = {
       Type = "oneshot";
@@ -41,6 +42,7 @@
       OnCalendar = "hourly";
       RandomizedDelaySec = "1h";
     };
+    requires = [ "network-online.target" ];
     after = [ "network-online.target" ];
   };
 }

hosts/web-2/gitea.nix

@@ -12,10 +12,6 @@
       user = "gitea";
       socket = "/run/postgresql";
     };
-    rootUrl = "https://git.clerie.de/";
-    domain = "git.clerie.de";
-    httpAddress =  "127.0.0.1";
-    httpPort = 3000;
     lfs.enable = true;
     settings = {
       log = {
@@ -30,6 +26,10 @@
         DEFAULT_PRIVATE = true;
       };
       server = {
+        ROOT_URL = "https://git.clerie.de/";
+        DOMAIN = "git.clerie.de";
+        HTTP_ADDRESS = "127.0.0.1";
+        HTTP_PORT = 3000;
         OFFLINE_MODE = true;
         LANDING_PAGE = "explore";
       };
@@ -66,7 +66,7 @@
     ensureUsers = [
       {
         name = "gitea";
-        ensurePermissions."DATABASE gitea" = "ALL PRIVILEGES";
+        ensureDBOwnership = true;
       }
     ];
   };

modules/clerie-system-upgrade/default.nix

@@ -21,7 +21,7 @@ in
         description = "Automatically check and install upgrades";
       };
       startAt = mkOption {
-        type = with types; nullOr string;
+        type = with types; nullOr str;
         default = null;
         description = "Systemd time string for starting the unit";
       };