servers now have an unique toggle for nginx

hosts/server/configuration.nix

@@ -16,12 +16,30 @@
       ffmpreg.enable = true;
       ffmpeg4discord.enable = true;
     };
+    servers = {
+      sonarr.enable = true;
+      radarr.enable = true;
+      lidarr.enable = true;
+      jellyfin.enable = true;
+      bazarr.enable = true;
+      kavita.enable = true;
     };
-  networking = {
+  };
+  networking = let
+    ports = [
+      2049 # idk
+      8989 # sonarr
+      7878 # radarr
+      8686 # lidarr
+      8096 # jellyfin
+      6767 # bazarr
+      5000 # kavita
+    ];
+  in {
     hostName = "server";
     firewall = {
-      allowedTCPPorts = [ 2049 ];
+      allowedTCPPorts = ports;
-      allowedUDPPorts = [ 2049 ];
+      allowedUDPPorts = ports;
     };
   };
   nixpkgs.hostPlatform = "x86_64-linux";

modules/servers.nix

@@ -104,10 +104,13 @@ in {
       description = "localhost smtp email";
     };
     enableContainers = lib.mkEnableOption "enable";
+    enableProxy = lib.mkEnableOption "enable";
   };
   config = {
-    my.enableContainers = lib.mkDefault false;
+    my = {
-    my.servers = {
+      enableContainers = lib.mkDefault false;
+      enableProxy = lib.mkDefault false;
+      servers = {
         jellyfin = {
           enable = lib.mkDefault false;
           enableCron = lib.mkDefault false;
@@ -142,6 +145,7 @@ in {
         vaultwarden.enable = lib.mkDefault false;
         firefly-iii.enable = lib.mkDefault false;
       };
+    };
     virtualisation = {
       containers.enable = true;
       oci-containers.backend = "podman";
@@ -162,6 +166,7 @@ in {
       defaults.email = config.my.email;
     };
     services.nginx = {
+      enable = config.my.enableProxy;
       clientMaxBodySize = "4096m";
       sslCiphers = "AES256+EECDH:AES256+EDH:!aNULL";
     };

modules/servers/audiobookshelf.nix

@@ -10,9 +10,7 @@ in {
         group = "piracy";
         port = cfg.port;
       };
-      nginx = {
+      nginx.virtualHosts."${cfg.host}" = proxy {
-        enable = true;
-        virtualHosts."${cfg.host}" = proxy {
         "/" = {
           proxyPass = cfg.local;
           extraConfig = ''
@@ -28,5 +26,4 @@ in {
       };
     };
   };
-  };
 }

modules/servers/bazarr.nix

@@ -6,11 +6,8 @@
         enable = true;
         group = "piracy";
       };
-      nginx = {
+      nginx.virtualHosts."subs.${config.my.domain}" =
-        enable = true;
-        virtualHosts."subs.${config.my.domain}" =
         proxyReverse config.services.bazarr.listenPort // { };
     };
   };
-  };
 }

modules/servers/flame.nix

@@ -39,7 +39,6 @@ in {
       };
     };
     services.nginx = {
-      enable = true;
       virtualHosts."start.${config.my.domain}" = proxyReverse port // { };
       virtualHosts."qampqwn4wprhqny8h8zj.${config.my.domain}" =
         proxyReverse portSecret // { };

modules/servers/homepage.nix

@@ -40,10 +40,7 @@ in {
           ];
         }];
       };
-      nginx = {
+      nginx.virtualHosts."home.${config.my.domain}" = proxyReverse port // { };
-        enable = true;
-        virtualHosts."home.${config.my.domain}" = proxyReverse port // { };
-      };
     };
   };
 }

modules/servers/jellyfin.nix

@@ -10,7 +10,6 @@ in {
         group = "piracy";
       };
       nginx = {
-        enable = true;
         appendHttpConfig = ''
           # JELLYFIN
           proxy_cache_path /var/cache/nginx/jellyfin-videos levels=1:2 keys_zone=jellyfin-videos:100m inactive=1d max_size=35000m;

modules/servers/kavita.nix

@@ -15,11 +15,8 @@
         enable = true;
         tokenKeyFile = config.sops.secrets.kavita-token.path;
       };
-      nginx = {
+      nginx.virtualHosts."library.${config.my.domain}" =
-        enable = true;
-        virtualHosts."library.${config.my.domain}" =
         proxyReverse config.services.kavita.port // { };
     };
   };
-  };
 }

modules/servers/lidarr.nix

@@ -15,9 +15,9 @@ in {
         PGID = "100";
       };
       volumes = [
-        "/mnt/pool/multimedia:/data"
+        "/mnt/btrfs/multimedia:/data"
-        "/mnt/pool/multimedia/media/Music:/music"
+        "/mnt/btrfs/multimedia/media/Music:/music"
-        "/mnt/pool/multimedia/media/MusicVideos:/music-videos"
+        "/mnt/btrfs/multimedia/media/MusicVideos:/music-videos"
         "${config.my.containerData}/lidarr/files:/config"
         "${config.my.containerData}/lidarr/custom-services.d:/custom-services.d"
         "${config.my.containerData}/lidarr/custom-cont-init.d:/custom-cont-init.d"
@@ -31,10 +31,7 @@ in {
     };
     services = {
       lidarr.enable = true;
-      nginx = {
+      nginx.virtualHosts."${url}" = proxyReverseArr port // { };
-        enable = true;
-        virtualHosts."${url}" = proxyReverseArr port // { };
-      };
     };
   };
 }

modules/servers/maloja.nix

@@ -26,9 +26,6 @@ in {
         "flame.icon" = "bookmark-music";
       };
     };
-    services.nginx = {
+    services.nginx.virtualHosts."${url}" = proxyReverse port // { };
-      enable = true;
-      virtualHosts."${url}" = proxyReverse port // { };
-    };
   };
 }

modules/servers/mealie.nix

@@ -34,9 +34,6 @@ in {
         "flame.icon" = "fridge";
       };
     };
-    services.nginx = {
+    services.nginx.virtualHosts."${domain}" = proxyReverse port // { };
-      enable = true;
-      virtualHosts."${domain}" = proxyReverse port // { };
-    };
   };
 }

modules/servers/metube.nix

@@ -15,9 +15,7 @@ in {
         YTDL_OPTIONS = ''{"cookiefile":"/cookies.txt"}'';
       };
     };
-    services.nginx = {
+    services.nginx.virtualHosts."bajameesta.${config.my.domain}" =
-      enable = true;
+      proxyReverse port // { };
-      virtualHosts."bajameesta.${config.my.domain}" = proxyReverse port // { };
-    };
   };
 }

modules/servers/microbin.nix

@@ -17,11 +17,8 @@
           MICROBIN_ENCRYPTION_SERVER_SIDE = true;
         };
       };
-      nginx = {
+      nginx.virtualHosts."copy.${config.my.domain}" =
-        enable = true;
-        virtualHosts."copy.${config.my.domain}" =
         proxyReverse config.services.microbin.settings.MICROBIN_PORT // { };
     };
   };
-  };
 }

modules/servers/multi-scrobbler.nix

@@ -29,9 +29,6 @@ in {
         "flame.icon" = "broadcast";
       };
     };
-    services.nginx = {
+    services.nginx.virtualHosts."${domain}" = proxyReverse port // { };
-      enable = true;
-      virtualHosts."${domain}" = proxyReverse port // { };
-    };
   };
 }

modules/servers/nextcloud.nix

@@ -131,9 +131,7 @@ in {
           # phpExtraExtensions = all: [ all.pdlib all.bz2 ];
           phpExtraExtensions = all: [ ];
         };
-        nginx = {
+        nginx.virtualHosts = {
-          enable = true;
-          virtualHosts = {
           ${config.services.nextcloud.hostName} = {
             forceSSL = true;
             enableACME = true;
@@ -180,7 +178,6 @@ in {
             };
         };
       };
-      };
       virtualisation.oci-containers.containers = {
         go-vod = lib.mkIf config.my.servers.go-vod.enable {
           autoStart = true;

modules/servers/prowlarr.nix

@@ -7,12 +7,9 @@
     };
     services = {
       prowlarr.enable = true;
-      nginx = {
+      nginx.virtualHosts."indexer.${config.my.domain}" = proxyReverseArr 9696
-        enable = true;
-        virtualHosts."indexer.${config.my.domain}" = proxyReverseArr 9696
         // { };
     };
-    };
     virtualisation.oci-containers.containers.flaresolverr = {
       autoStart = true;
       image = "ghcr.io/flaresolverr/flaresolverr:latest";

modules/servers/qbittorrent.nix

@@ -74,11 +74,8 @@ in {
         };
       };
     };
-    services.nginx = {
+    services.nginx.virtualHosts."xfwmrle6h6skqujbeizw.${config.my.domain}" =
-      enable = true;
-      virtualHosts."xfwmrle6h6skqujbeizw.${config.my.domain}" =
       proxyReverse port // { };
-    };
     networking.firewall = {
       allowedTCPPorts = ports;
       allowedUDPPorts = ports;

modules/servers/radarr.nix

@@ -6,10 +6,8 @@
         enable = true;
         group = "piracy";
       };
-      nginx = {
+      nginx.virtualHosts."movies.${config.my.domain}" = proxyReverseArr 7878
-        enable = true;
+        // { };
-        virtualHosts."movies.${config.my.domain}" = proxyReverseArr 7878 // { };
-      };
     };
   };
 }

modules/servers/ryot.nix

@@ -25,9 +25,7 @@ in {
           "flame.icon" = "radar";
         };
       };
-      services.nginx = {
+      services.nginx.virtualHosts."tracker.${config.my.domain}" =
-        enable = true;
+        proxyReverse port // { };
-        virtualHosts."tracker.${config.my.domain}" = proxyReverse port // { };
-      };
     };
 }

modules/servers/shiori.nix

@@ -13,11 +13,8 @@
           environmentFile = config.sops.secrets.shiori.path;
           databaseUrl = "postgres:///shiori?host=${config.my.postgresSocket}";
         };
-        nginx = {
+        nginx.virtualHosts."bookmarks.${config.my.domain}" =
-          enable = true;
-          virtualHosts."bookmarks.${config.my.domain}" =
           proxyReverse config.services.shiori.port // { };
       };
     };
-    };
 }

modules/servers/sonarr.nix

@@ -6,10 +6,8 @@
         enable = true;
         group = "piracy";
       };
-      nginx = {
+      nginx.virtualHosts."series.${config.my.domain}" = proxyReverse 8989
-        enable = true;
+        // { };
-        virtualHosts."series.${config.my.domain}" = proxyReverse 8989 // { };
-      };
     };
   };
 }

modules/servers/vaultwarden.nix

@@ -22,11 +22,8 @@
             LOG_LEVEL = "warn";
           };
         };
-        nginx = {
+        nginx.virtualHosts."vault.${config.my.domain}" =
-          enable = true;
-          virtualHosts."vault.${config.my.domain}" =
           proxyReverse config.services.vaultwarden.config.ROCKET_PORT // { };
       };
     };
-    };
 }