Clean up

caddy.nix

@@ -71,10 +71,10 @@ in
         useACMEHost = config.services.coturn.realm;
       };
       "lastfm.catnip.ee".extraConfig = ''
-        reverse_proxy :${toString settings.ports.lastfm}
+        reverse_proxy :${toString config.services.lastfm-status.port}
       '';
       "forge.catnip.ee".extraConfig = ''
-        reverse_proxy :${toString settings.ports.forgejo}
+        reverse_proxy :${toString config.services.forgejo.settings.server.HTTP_PORT}
       '';
       "http://syncthing.internal".extraConfig = ''
         @local remote_ip private_ranges 100.64.0.0/10
@@ -86,7 +86,7 @@ in
       '';
       "http://bazarr.internal".extraConfig = ''
         @local remote_ip private_ranges 100.64.0.0/10
-        reverse_proxy @local :${toString settings.ports.bazarr}
+        reverse_proxy @local :${toString config.services.bazarr.listenPort}
       '';
       "http://archive.internal".extraConfig = ''
         @local remote_ip private_ranges 100.64.0.0/10
@@ -94,7 +94,7 @@ in
       '';
       "http://scrutiny.internal".extraConfig = ''
         @local remote_ip private_ranges 100.64.0.0/10
-        reverse_proxy @local :${toString settings.ports.scrutiny}
+        reverse_proxy @local :${toString config.services.scrutiny.settings.web.listen.port}
       '';
       "http://prowlarr.internal".extraConfig = ''
         @local remote_ip private_ranges 100.64.0.0/10
@@ -146,7 +146,7 @@ in
       "matrix.catnip.ee".extraConfig = ''
         reverse_proxy :${toString settings.ports.synapse}
 
-        redir /telegram     /telegram/
+        redir /telegram /telegram/
 
         handle /.well-known/matrix/client {
           header Content-Type application/json
@@ -228,7 +228,7 @@ in
         reverse_proxy :${toString settings.ports.plex}
       '';
       "confess.catnip.ee".extraConfig = ''
-        reverse_proxy :${toString settings.ports.confess}
+        reverse_proxy :${toString config.services.confess-web.port}
       '';
 
       ":80".extraConfig = ''

configuration.nix

@@ -166,7 +166,6 @@
         3478
         5349
 
-        settings.ports.privoxy
         config.services.forgejo.settings.server.SSH_PORT
       ];
     };
@@ -240,7 +239,7 @@
     };
     confess-web = {
       enable = true;
-      port = settings.ports.confess;
+      port = 8011;
       reverseProxy = true;
       trustedProxy = "127.0.0.1";
       environmentFile = "/etc/secrets/confess.env";
@@ -265,7 +264,7 @@
     };
     lastfm-status = {
       enable = true;
-      port = settings.ports.lastfm;
+      port = 4014;
     };
     unpackerr = {
       enable = true;
@@ -325,7 +324,7 @@
     scrutiny = {
       enable = true;
       collector.enable = true;
-      settings.web.listen.port = settings.ports.scrutiny;
+      settings.web.listen.port = 4012;
     };
 
     # /var/lib/gitea-runner
@@ -354,7 +353,7 @@
       settings = {
         server = {
           DOMAIN = "forge.catnip.ee";
-          HTTP_PORT = settings.ports.forgejo;
+          HTTP_PORT = 4005;
           SSH_PORT = 2222;
           START_SSH_SERVER = true;
           ROOT_URL = "https://${config.services.forgejo.settings.server.DOMAIN}";
@@ -485,7 +484,6 @@
               "scrutiny.internal"
               "archive.internal"
               "epic.internal"
-
               "sonarr.internal"
               "radarr.internal"
               "prowlarr.internal"
@@ -552,11 +550,7 @@
     prowlarr.enable = true; # port 9696, /var/lib/prowlarr
     radarr.enable = true; # port 7878, /var/lib/radarr
     sonarr.enable = true; # port 8989, /var/lib/sonarr
-    bazarr = {
-      # /var/lib/bazarr/
-      enable = true;
-      listenPort = settings.ports.bazarr;
-    };
+    bazarr.enable = true; # port 6767, /var/lib/bazarr
 
     # /var/lib/plex
     plex = {
@@ -738,7 +732,7 @@
         listeners = [
           {
             bind_addresses = [ "127.0.0.1" ];
-            port = settings.ports.synapse;
+            port = 8008;
             resources = [
               {
                 compress = true;
@@ -771,7 +765,7 @@
     ntfy-sh = {
       enable = true;
       settings = {
-        listen-http = ":${toString settings.ports.ntfy}";
+        listen-http = ":4006";
         base-url = "https://ntfy.catnip.ee";
       };
     };

games/minecraft/default.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, config, settings, ... }: {
+{ inputs, pkgs, config, ... }: {
   imports = [
     inputs.nix-minecraft.nixosModules.minecraft-servers
     inputs.drasl.nixosModules.drasl
@@ -8,7 +8,7 @@
 
   services = {
     caddy.virtualHosts."drasl.snailcore.net".extraConfig = ''
-      reverse_proxy :${toString settings.ports.drasl}
+      reverse_proxy http://${config.services.drasl.settings.ListenAddress}
     '';
     minecraft-servers = {
       enable = true;
@@ -38,7 +38,7 @@
       settings = {
         Domain = "drasl.snailcore.net";
         BaseURL = "https://drasl.snailcore.net";
-        ListenAddress = "0.0.0.0:${toString settings.ports.drasl}";
+        ListenAddress = "0.0.0.0:4017";
         DefaultAdmins = [ "kaya" ];
 
         RegistrationNewPlayer = {

settings.nix

@@ -8,9 +8,8 @@
 
   ports = {
     palworld = 8211;
-    confess = 8011;
-    mautrix-telegram = 8009;
     synapse = 8008;
+    mautrix-telegram = 8009;
 
     prowlarr = 9696;
     radarr = 7878;
@@ -18,17 +17,10 @@
     lidarr = 8686;
 
     epicgames-freegames-node = 4018;
-    drasl = 4017;
-    privoxy = 4015;
-    lastfm = 4014;
-    scrutiny = 4012;
     qbittorrent-torrent = 36163;
     qbittorrent = 4010;
     archivebox = 4009;
     nextcloud = 4008;
-    bazarr = 4007;
-    ntfy = 4006;
-    forgejo = 4005;
     jellyfin_vue = 4004;
     jellyfin = 8096;
     wakapi = 4001;