diff options
-rw-r--r-- | custom/simp_le.nix | 2 | ||||
-rw-r--r-- | custom/ymir-nginx.nix | 22 |
2 files changed, 8 insertions, 16 deletions
diff --git a/custom/simp_le.nix b/custom/simp_le.nix index 4082612e..2143dfad 100644 --- a/custom/simp_le.nix +++ b/custom/simp_le.nix | |||
@@ -7,7 +7,7 @@ dir: | |||
7 | domain: | 7 | domain: |
8 | 8 | ||
9 | let | 9 | let |
10 | script = writeText "cert.sh" '' | 10 | script = writeText "${domain}.sh" '' |
11 | mkdir -p ${dir} | 11 | mkdir -p ${dir} |
12 | cd ${dir} | 12 | cd ${dir} |
13 | ${simp_le}/bin/simp_le -d ${domain}:/srv/www/acme/${domain}/ \ | 13 | ${simp_le}/bin/simp_le -d ${domain}:/srv/www/acme/${domain}/ \ |
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix index 3664ad7d..ac64cac7 100644 --- a/custom/ymir-nginx.nix +++ b/custom/ymir-nginx.nix | |||
@@ -116,21 +116,13 @@ in { | |||
116 | } | 116 | } |
117 | 117 | ||
118 | server { | 118 | server { |
119 | http { | 119 | listen *:80; |
120 | listen *:80; | 120 | listen *:443 ssl; |
121 | listen *:443 ssl; | 121 | listen [::]:80; |
122 | listen [::]:80; | 122 | listen [::]:443 ssl; |
123 | listen [::]:443 ssl; | 123 | ssl_certificate /etc/nginx/ssl/git.yggdrasil.li/fullchain.pem; |
124 | ssl_certificate /etc/nginx/ssl/git.yggdrasil.li/fullchain.pem; | 124 | ssl_certificate_key /etc/nginx/ssl/git.yggdrasil.li/privkey.pem; |
125 | ssl_certificate_key /etc/nginx/ssl/git.yggdrasil.li/privkey.pem; | 125 | server_name git.yggdrasil.li; |
126 | server_name git.yggdrasil.li; | ||
127 | } | ||
128 | |||
129 | http { | ||
130 | listen *:80; | ||
131 | listen [::]:80; | ||
132 | server_name www.git.yggdrasil.li; | ||
133 | } | ||
134 | 126 | ||
135 | root ${pkgs.cgit}/cgit; | 127 | root ${pkgs.cgit}/cgit; |
136 | 128 | ||