diff options
| -rw-r--r-- | custom/ymir-nginx.nix | 2 | ||||
| -rw-r--r-- | ymir.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix index 066320c3..a001d703 100644 --- a/custom/ymir-nginx.nix +++ b/custom/ymir-nginx.nix | |||
| @@ -25,7 +25,7 @@ let | |||
| 25 | 25 | ||
| 26 | acme = builtins.toFile "acme" '' | 26 | acme = builtins.toFile "acme" '' |
| 27 | location /.well-known/acme-challenge { | 27 | location /.well-known/acme-challenge { |
| 28 | root /srv/www/acme/$host/; | 28 | root /srv/www/acme/; |
| 29 | } | 29 | } |
| 30 | ''; | 30 | ''; |
| 31 | 31 | ||
| @@ -840,9 +840,9 @@ in rec { | |||
| 840 | "yggdrasil.li" = { | 840 | "yggdrasil.li" = { |
| 841 | allowKeysForGroup = true; | 841 | allowKeysForGroup = true; |
| 842 | group = "ssl"; | 842 | group = "ssl"; |
| 843 | webroot = "/srv/www/acme/yggdrasil.li"; | 843 | webroot = "/srv/www/acme"; |
| 844 | email = "phikeebaogobaegh@141.li"; | 844 | email = "phikeebaogobaegh@141.li"; |
| 845 | extraDomains = builtins.listToAttrs (builtins.map (name: { inherit name; value = "/srv/www/acme/${name}"; }) myDomains); | 845 | extraDomains = builtins.listToAttrs (builtins.map (name: { inherit name; value = null; }) myDomains); |
| 846 | postRun = '' | 846 | postRun = '' |
| 847 | systemctl reload nginx.service dovecot2.service postfix.service prosody.service vsftpd.service infinoted.service | 847 | systemctl reload nginx.service dovecot2.service postfix.service prosody.service vsftpd.service infinoted.service |
| 848 | ''; | 848 | ''; |
| @@ -852,7 +852,7 @@ in rec { | |||
| 852 | 852 | ||
| 853 | systemd.services."acme-yggdrasil.li".requires = [ "nginx.service" ]; | 853 | systemd.services."acme-yggdrasil.li".requires = [ "nginx.service" ]; |
| 854 | systemd.tmpfiles.rules | 854 | systemd.tmpfiles.rules |
| 855 | = let mkDir = domain: "d /srv/www/acme/${domain} 0775 root ssl 10d -"; | 855 | = let mkDir = domain: "d /srv/www/acme 0775 root ssl 10d -"; |
| 856 | in map mkDir myDomains; | 856 | in map mkDir myDomains; |
| 857 | 857 | ||
| 858 | services.uucp = { | 858 | services.uucp = { |
