refactor

hosts/apu/configuration.nix

@@ -218,7 +218,7 @@
     };
   };
 
-  modules.services.webserver = {
+  services.webserver = {
     enable = true;
     acme.dnsChallenge = true;
     vHosts."koti.repomaa.com" = {

hosts/freun.dev/services.nix

@@ -28,20 +28,6 @@ in
   };
 
   modules.services = {
-    vaultwarden = {
-      enable = true;
-      subdomain = "pw";
-      config = {
-        YUBICO_CLIENT_ID = 86799;
-        SMTP_HOST = smtp.host;
-        SMTP_FROM = smtp.from;
-        SMTP_FROM_NAME = "Vaultwarden";
-        SMTP_USERNAME = smtp.username;
-        SMTP_PORT = smtp.port;
-        HELO_NAME = smtp.heloName;
-      };
-    };
-
     immich = {
       enable = true;
       subdomain = "img";
@@ -49,55 +35,6 @@ in
       storageDirs = [ syncthingDataDir ];
       version = "v1.125.7";
     };
-
-    syncthing = {
-      enable = true;
-      subdomain = "sync";
-      dataDir = syncthingDataDir;
-    };
-
-    gotosocial = {
-      enable = true;
-      subdomain = "social";
-      settings = {
-        smtp-host = smtp.host;
-        smtp-port = smtp.port;
-        smtp-username = smtp.username;
-        smtp-from = smtp.from;
-      };
-    };
-
-    workout-tracker = {
-      enable = true;
-      subdomain = "fit";
-    };
-
-    workout-sync = {
-      enable = true;
-      subdomain = "ws";
-    };
-
-    invidious = {
-      enable = true;
-      subdomain = "vid";
-    };
-
-    grafana = {
-      enable = true;
-      subdomain = "graph";
-    };
-
-    gtrackmap = {
-      enable = true;
-      subdomain = "trackmap";
-    };
-
-    owncast = {
-      enable = true;
-      subdomain = "stream";
-    };
-
-    tailscale.enable = true;
   };
 
   services = {
@@ -130,5 +67,77 @@ in
         };
       };
     };
+
+    grafana = {
+      enable = true;
+      subdomain = "graph";
+      settings.smtp = {
+        enabled = true;
+        host = smtp.host;
+        port = smtp.port;
+        user = smtp.username;
+        from_address = smtp.from;
+      };
+    };
+
+    owncast = {
+      enable = true;
+      subdomain = "stream";
+    };
+
+    gtrackmap = {
+      enable = true;
+      subdomain = "trackmap";
+      port = 3001;
+    };
+
+    invidious = {
+      enable = true;
+      subdomain = "vid";
+    };
+
+    syncthing = {
+      enable = true;
+      subdomain = "sync";
+      dataDir = syncthingDataDir;
+    };
+
+    tailscale.enable = true;
+
+    gotosocial = {
+      enable = true;
+      subdomain = "social";
+      settings = {
+        smtp-host = smtp.host;
+        smtp-port = smtp.port;
+        smtp-username = smtp.username;
+        smtp-from = smtp.from;
+        instance-languages = [ "de" "fi" "en" ];
+      };
+    };
+
+    vaultwarden = {
+      enable = true;
+      subdomain = "pw";
+      config = {
+        YUBICO_CLIENT_ID = 86799;
+        SMTP_HOST = smtp.host;
+        SMTP_FROM = smtp.from;
+        SMTP_FROM_NAME = "Vaultwarden";
+        SMTP_USERNAME = smtp.username;
+        SMTP_PORT = smtp.port;
+        HELO_NAME = smtp.heloName;
+      };
+    };
+
+    workout-tracker = {
+      enable = true;
+      subdomain = "fit";
+    };
+
+    workout-sync = {
+      enable = true;
+      subdomain = "ws";
+    };
   };
 }