Compare commits

..
2 changed files with 7 additions and 15 deletions

View file

@ -2,12 +2,11 @@
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
config = { config = {
DOMAIN = "https://pass.proxy.${homelab.domain}"; DOMAIN = "pass.proxy.${homelab.domain}";
ROCKET_PORT = 8060;
ROCKET_ADDRESS = "127.0.0.1";
ROCKET_LOG = "critical";
DATA_FOLDER = "/mnt/data/vaultwarden";
SIGNUPS_ALLOWED = true; SIGNUPS_ALLOWED = true;
ROCKET_ADDRESS = "127.0.0.1";
ROCKET_PORT = 8060;
ROCKET_LOG = "critical";
}; };
}; };
} }

View file

@ -1,6 +1,6 @@
{ homelab, lib, ... }: let { homelab, lib, ... }: let
base = "proxy.${homelab.domain}"; base = "proxy.${homelab.domain}";
hosts = { proxy-mappings = {
"dns" = { dest = "http://localhost:8088"; auth = true; }; "dns" = { dest = "http://localhost:8088"; auth = true; };
"ai" = { dest = "http://localhost:8080"; auth = true; }; "ai" = { dest = "http://localhost:8080"; auth = true; };
@ -21,10 +21,6 @@
"cdn" = { dest = "http://localhost:3000"; auth = false; }; "cdn" = { dest = "http://localhost:3000"; auth = false; };
"@" = { dest = "http://localhost:5070"; auth = false; }; "@" = { dest = "http://localhost:5070"; auth = false; };
}; };
redirects = {
"www" = "https://proxy.${homelab.domain}";
"dash" = "https://${homelab.domain}";
};
in { in {
users.users.nginx.extraGroups = [ "acme" ]; users.users.nginx.extraGroups = [ "acme" ];
security.acme = { security.acme = {
@ -50,13 +46,10 @@ in {
useACMEHost = base; useACMEHost = base;
locations."/".return = "404"; locations."/".return = "404";
}; };
} // lib.mapAttrs' (subdomain: cfg: lib.nameValuePair "${subdomain}.${base}" { } // lib.mapAttrs' (subdomain: cfg: lib.nameValuePair (if subdomain == "@" then base else "${subdomain}.${base}") {
useACMEHost = base;
forceSSL = true;
locations."/".return = "301 https://${base}$request_uri";
}) redirects // lib.mapAttrs' (subdomain: cfg: lib.nameValuePair (if subdomain == "@" then base else "${subdomain}.${base}") {
useACMEHost = base; useACMEHost = base;
forceSSL = true; forceSSL = true;
locations."/" = { locations."/" = {
proxyPass = cfg.dest; proxyPass = cfg.dest;
proxyWebsockets = true; proxyWebsockets = true;
@ -76,6 +69,6 @@ in {
client_max_body_size 50000M; client_max_body_size 50000M;
''; '';
}; };
}) hosts; }) proxy-mappings;
}; };
} }