diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix index 4d6b5c6..30f2597 100644 --- a/machines/fanny/configuration.nix +++ b/machines/fanny/configuration.nix @@ -313,6 +313,21 @@ in ''; }; }; + + virtualHosts."www.rm16bleibt.org" = { + forceSSL = true; + enableACME = true; + locations."/" = { + proxyPass = "http://${hosts.malobeo.hosts.wordpress.network.address}:80"; + recommendedProxySettings = true; + extraConfig = '' + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Port 443; + proxy_set_header X-Forwarded-Proto https; + ''; + }; + }; + virtualHosts."cache.malobeo.org" = { forceSSL = true; enableACME = true; diff --git a/machines/fanny/dyndns.nix b/machines/fanny/dyndns.nix index 0f43958..e135141 100644 --- a/machines/fanny/dyndns.nix +++ b/machines/fanny/dyndns.nix @@ -8,9 +8,11 @@ KEYCLOUD=$(cat /run/secrets/njalacloud) KEYZINES=$(cat /run/secrets/njalazines) KEYANATAMAP=$(cat /run/secrets/njalaantamap) + KEYRM16=$(cat /run/secrets/njalarm16) ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=cloud.malobeo.org&k="$KEYCLOUD"&auto" ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=zines.malobeo.org&k="$KEYZINES"&auto" ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=antamap.malobeo.org&k="$KEYANATAMAP"&auto" + ${pkgs.curl}/bin/curl --fail --silent --show-error "https://njal.la/update/?h=www.rm16bleibt.org&k="$KEYRM16"&auto" ''; serviceConfig = { Type = "oneshot";