diff --git a/machines/elrond/routes.nix b/machines/elrond/routes.nix index 37bfa1f..7521215 100644 --- a/machines/elrond/routes.nix +++ b/machines/elrond/routes.nix @@ -1,12 +1,12 @@ { config, pkgs, lib, ... }: { services.nginx = { - virtualHosts."managment.funn-nas.lauterer.it" = { + virtualHosts."managment.lauterer.it" = { forceSSL = true; useACMEHost = config.networking.domain; locations."/" = { proxyWebsockets = true; - proxyPass = "https://100.104.182.48:443"; + proxyPass = "http://100.104.182.48"; }; basicAuthFile = config.sops.secrets."nginx/defaultpass".path; }; @@ -51,29 +51,15 @@ basicAuthFile = config.sops.secrets."nginx/defaultpass".path; }; - virtualHosts."freshrss.lauterer.it" = { + virtualHosts."rss.lauterer.it" = { forceSSL = true; useACMEHost = config.networking.domain; locations."/" = { proxyWebsockets = true; - proxyPass = "http://100.84.215.84:80"; + proxyPass = "http://100.84.215.84:8081"; }; - basicAuthFile = config.sops.secrets."nginx/defaultpass".path; + #basicAuthFile = config.sops.secrets."nginx/defaultpass".path; }; - - virtualHosts."minecraft.256.no" = { - locations."/" = { - proxyWebsockets = true; - proxyPass = "100.84.215.84:25565"; - # extraConfig = '' - # proxy_set_header Host $host; - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; - # ''; - }; - }; - }; } diff --git a/services/nginx.nix b/services/nginx.nix index e5a4c22..24def30 100644 --- a/services/nginx.nix +++ b/services/nginx.nix @@ -8,8 +8,6 @@ # services.oauth2_proxy = { # enable = true; # } - - #proxy stuff services.nginx = { enable = true; @@ -24,79 +22,5 @@ commonHttpConfig = '' access_log syslog:server=unix:/dev/log; ''; - - - virtualHosts."managment.funn-nas.lauterer.it" = { - forceSSL = true; - useACMEHost = config.networking.domain; - locations."/" = { - proxyWebsockets = true; - proxyPass = "https://100.104.182.48"; - }; - basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - }; - - virtualHosts."funn-nas.lauterer.it" = { - forceSSL = true; - useACMEHost = config.networking.domain; - locations."/" = { - proxyWebsockets = true; - proxyPass = "https://100.104.182.48:30044"; - }; - basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - }; - - virtualHosts."home.lauterer.it" = { - forceSSL = true; - useACMEHost = config.networking.domain; - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://10.0.0.32:8123"; - }; - # ignorerer sikkerhet for littegran for å oprettholde lettvinthet og app kompatibilitet. - #basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - }; - - virtualHosts."jellyfin.lauterer.it" = { - forceSSL = true; - useACMEHost = config.networking.domain; - locations."/" = { - proxyWebsockets = true; - proxyPass = "http://100.84.215.84:8096"; - }; - #basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - }; - - # virtualHosts.${"vpn."+config.networking.domain} = { - # forceSSL = true; - # useACMEHost = "${config.networking.domain}"; - # locations."/" = { - # proxyWebsockets = true; - # proxyPass = "http://localhost:${toString config.services.headscale.port}"; - # }; - # }; - - # virtualHosts.${config.services.kanidm.serverSettings.domain} = { # (auth.) - # forceSSL = true; - # useACMEHost = "${config.networking.domain}"; - # locations."/" = { - # proxyWebsockets = true; - # proxyPass = "${"https://"+config.services.kanidm.serverSettings.bindaddress}"; - - # }; - # }; - - # virtualHosts.${"jellyfin."+config.networking.domain} = { - # forceSSL = true; - # #enableACME = true; - # useACMEHost = "${config.networking.domain}"; - # locations."/" = { - # proxyPass = "http://jellyfin.galadriel"; - # proxyWebsockets = true; - # basicAuthFile = config.sops.secrets."nginx/defaultpass".path; - # }; - # }; }; - - }