From d23423b92c89c9573f5dc14030298a1e50d8f0d2 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 24 Feb 2021 20:50:05 +0000 Subject: [PATCH] services: s/= "${domain}"/= domain --- services/blog.nix | 2 +- services/calibre-web.nix | 2 +- services/gitea.nix | 2 +- services/indexers.nix | 4 ++-- services/jellyfin.nix | 2 +- services/matrix.nix | 10 +++++----- services/miniflux.nix | 2 +- services/nextcloud.nix | 2 +- services/pirate.nix | 2 +- services/rss-bridge.nix | 2 +- services/transmission.nix | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/services/blog.nix b/services/blog.nix index 99de0bc..0a5fcf1 100644 --- a/services/blog.nix +++ b/services/blog.nix @@ -21,7 +21,7 @@ let makeVirtualHost = with lib.attrsets; name: root: nameValuePair "${name}" { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; inherit root; # Make my blog the default landing site default = (name == domain); diff --git a/services/calibre-web.nix b/services/calibre-web.nix index a931ce5..57d0e69 100644 --- a/services/calibre-web.nix +++ b/services/calibre-web.nix @@ -44,7 +44,7 @@ in services.nginx.virtualHosts."${calibreDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${toString cfg.port}/"; }; diff --git a/services/gitea.nix b/services/gitea.nix index b5c1d82..d401a91 100644 --- a/services/gitea.nix +++ b/services/gitea.nix @@ -62,7 +62,7 @@ in # Proxy to Gitea services.nginx.virtualHosts."${giteaDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${toString cfg.port}/"; }; diff --git a/services/indexers.nix b/services/indexers.nix index eb304b0..f7f405a 100644 --- a/services/indexers.nix +++ b/services/indexers.nix @@ -24,7 +24,7 @@ in services.nginx.virtualHosts."${jackettDomain}" = lib.mkIf cfg.jackett.enable { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${toString jackettPort}/"; }; @@ -36,7 +36,7 @@ in services.nginx.virtualHosts."${nzbhydraDomain}" = lib.mkIf cfg.nzbhydra.enable { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${toString nzbhydraPort}/"; }; diff --git a/services/jellyfin.nix b/services/jellyfin.nix index d488424..b420892 100644 --- a/services/jellyfin.nix +++ b/services/jellyfin.nix @@ -19,7 +19,7 @@ in # Proxy to Jellyfin services.nginx.virtualHosts."${jellyfinDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/" = { proxyPass = "http://localhost:8096/"; diff --git a/services/matrix.nix b/services/matrix.nix index 4c22466..8dc6cad 100644 --- a/services/matrix.nix +++ b/services/matrix.nix @@ -71,7 +71,7 @@ in services.nginx.virtualHosts = { "matrix.${domain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations = let @@ -100,7 +100,7 @@ in "matrix.${domain}_federation" = rec { forceSSL = true; serverName = "matrix.${domain}"; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".return = "404"; @@ -117,7 +117,7 @@ in "${domain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."= /.well-known/matrix/server".extraConfig = let @@ -145,7 +145,7 @@ in # Element Web app deployment "chat.${domain}" = { - useACMEHost = "${domain}"; + useACMEHost = domain; forceSSL = true; root = pkgs.element-web.override { @@ -153,7 +153,7 @@ in default_server_config = { "m.homeserver" = { "base_url" = "https://matrix.${domain}"; - "server_name" = "${domain}"; + "server_name" = domain; }; "m.identity_server" = { "base_url" = "https://vector.im"; diff --git a/services/miniflux.nix b/services/miniflux.nix index 67b8967..42f0983 100644 --- a/services/miniflux.nix +++ b/services/miniflux.nix @@ -59,7 +59,7 @@ in # Proxy to Jellyfin services.nginx.virtualHosts."${minifluxDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${toString cfg.privatePort}/"; }; diff --git a/services/nextcloud.nix b/services/nextcloud.nix index fe1d8e6..7c6a180 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -61,7 +61,7 @@ in services.nginx.virtualHosts."${nextcloudDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:3000/"; }; diff --git a/services/pirate.nix b/services/pirate.nix index d55ddd4..bb6a97c 100644 --- a/services/pirate.nix +++ b/services/pirate.nix @@ -26,7 +26,7 @@ let (mapAttrs' (service: port: nameValuePair "${service}.${domain}" { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${builtins.toString port}/"; }) diff --git a/services/rss-bridge.nix b/services/rss-bridge.nix index ce285e3..ad5141b 100644 --- a/services/rss-bridge.nix +++ b/services/rss-bridge.nix @@ -19,7 +19,7 @@ in services.nginx.virtualHosts."${rss-bridgeDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; }; }; } diff --git a/services/transmission.nix b/services/transmission.nix index a53507a..0cdf048 100644 --- a/services/transmission.nix +++ b/services/transmission.nix @@ -60,7 +60,7 @@ in # seems to have stalled services.nginx.virtualHosts."${webuiDomain}" = { forceSSL = true; - useACMEHost = "${domain}"; + useACMEHost = domain; locations."/".proxyPass = "http://localhost:${toString transmissionRpcPort}"; };