diff --git a/system/web-server/ksh-map.nix b/system/web-server/ksh-map.nix index 1377262..a0b9e73 100644 --- a/system/web-server/ksh-map.nix +++ b/system/web-server/ksh-map.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - services.nginx.virtualHosts."karte.nichtzudritt.de" = { + services.nginx.virtualHosts."kshmap.ktiu.net" = { forceSSL = true; enableACME = true; root = "/var/www/ksh-map/dist"; diff --git a/system/web-server/outline.nix b/system/web-server/outline.nix index 7a2b699..e2f5cee 100644 --- a/system/web-server/outline.nix +++ b/system/web-server/outline.nix @@ -7,11 +7,6 @@ let mail = "outline@${config.networking.domain}"; }; - # bootstrapping only - # dex = { - # hostname = "dex.${config.networking.domain}"; - # }; - in { services.outline = { @@ -42,38 +37,8 @@ in { # }; }; - # services.dex = { - # enable = true; - # environmentFile = "/var/custom-access/dex-environemnt"; - # settings = { - # issuer = "https://${dex.hostname}"; - # storage.type = "sqlite3"; - # web.http = "127.0.0.1:5556"; - # staticClients = [ - # { - # id = "outline"; - # name = "Outline Client"; - # redirectURIs = [ "https://${outline.hostname}/auth/oidc.callback" ]; - # secretFile = "/var/custom-access/outline-oidc-secret.txt"; - # } - # ]; - # enablePasswordDB = true; - # staticPasswords = [ - # { - # email = "till@ktiu.net"; - # # gen hash with $ htpasswd -nBC 10 "" | tr -d ':\n' - # hash = ""; - # username = "bootstrap-admin"; - # # $ uuidgen - # userID = ""; - # } - # ]; - # }; - # }; - security.acme.certs."${config.networking.domain}".extraDomainNames = [ "outline.${config.networking.domain}" - # "dex.${config.networking.domain}" ]; services.nginx.virtualHosts = { @@ -89,13 +54,5 @@ in { }; }; - # "dex.${config.networking.domain}" = { - # onlySSL = true; - # useACMEHost = config.networking.domain; - # locations."/" = { - # proxyPass = "http://${config.services.dex.settings.web.http}"; - # proxyWebsockets = true; - # }; - # }; }; }