diff --git a/config/instances/config/upRootNutrition.nix b/config/instances/config/upRootNutrition.nix index 16aed4c..5814a98 100755 --- a/config/instances/config/upRootNutrition.nix +++ b/config/instances/config/upRootNutrition.nix @@ -17,6 +17,9 @@ in { path1 = ""; path2 = ""; }; + ports = { + port0 = 1234; + }; ssl = { cert = "${sslPath}/${domain3}/fullchain.pem"; key = "${sslPath}/${domain3}/key.pem"; diff --git a/nixos/modules/services/mastodon/default.nix b/nixos/modules/services/mastodon/default.nix index b54c74e..eac2459 100755 --- a/nixos/modules/services/mastodon/default.nix +++ b/nixos/modules/services/mastodon/default.nix @@ -8,7 +8,7 @@ inherit (flake.config.machines.devices) server; inherit (flake.config.services.instances) mastodon web; service = mastodon; - host = web.domains.url1; + host = web.domains.url3; localhost = web.localhost.address0; in { # If you need to start fresh for some reason, run these to create the new Admin account: diff --git a/nixos/modules/services/upRootNutrition.nix b/nixos/modules/services/upRootNutrition.nix index 21be32d..2b30a6b 100755 --- a/nixos/modules/services/upRootNutrition.nix +++ b/nixos/modules/services/upRootNutrition.nix @@ -1,9 +1,4 @@ -{ - flake, - config, - ... -}: let - inherit (flake.config.machines.devices) server; +{flake, ...}: let inherit (flake.config.services.instances) upRootNutrition web; service = upRootNutrition; localhost = web.localhost.address0; @@ -14,23 +9,12 @@ in { virtualHosts = { "${host}" = { extraConfig = '' + redir /.well-known/carddav /remote.php/dav/ 301 + redir /.well-known/caldav /remote.php/dav/ 301 - root * /var/lib/website + reverse_proxy ${localhost}:${toString service.ports.port0} - file_server - - try_files {path} /index.html - encode gzip - - header { - # Disable FLoC tracking - Permissions-Policy interest-cohort=() - # Enable HSTS - Strict-Transport-Security "max-age=31536000; includeSubDomains" - # Prevent MIME-type sniffing - X-Content-Type-Options nosniff - - tls ${service.ssl.cert} ${service.ssl.key} + tls ${service.ssl.cert} ${service.ssl.key} ''; }; };