diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-01-24 12:28:41 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-01-24 12:28:41 +0100 |
commit | 46c75cd0b819c724a859d6ed4b65c01d2c12d225 (patch) | |
tree | 96a43d0eac63ec4a7c37e0ff95e50aca2f537f1f | |
parent | 8136f93fd98515aae456168f2bdb11f6bd8e73fd (diff) | |
download | nixos-46c75cd0b819c724a859d6ed4b65c01d2c12d225.tar nixos-46c75cd0b819c724a859d6ed4b65c01d2c12d225.tar.gz nixos-46c75cd0b819c724a859d6ed4b65c01d2c12d225.tar.bz2 nixos-46c75cd0b819c724a859d6ed4b65c01d2c12d225.tar.xz nixos-46c75cd0b819c724a859d6ed4b65c01d2c12d225.zip |
now with ssl
-rw-r--r-- | custom/simp_le.nix | 1 | ||||
-rw-r--r-- | custom/ymir-nginx.nix | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/custom/simp_le.nix b/custom/simp_le.nix index 2143dfad..114a6028 100644 --- a/custom/simp_le.nix +++ b/custom/simp_le.nix | |||
@@ -16,6 +16,7 @@ let | |||
16 | -f cert.pem \ | 16 | -f cert.pem \ |
17 | -f fullchain.pem \ | 17 | -f fullchain.pem \ |
18 | -f key.pem | 18 | -f key.pem |
19 | [[ -e key.pem ]] && ln -s key.pem privkey.pem | ||
19 | ''; | 20 | ''; |
20 | in | 21 | in |
21 | "${bash}/bin/bash ${script} > ${eject}/bin/logger -p auth.info" | 22 | "${bash}/bin/bash ${script} > ${eject}/bin/logger -p auth.info" |
diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix index f3b3fecb..747efb67 100644 --- a/custom/ymir-nginx.nix +++ b/custom/ymir-nginx.nix | |||
@@ -117,11 +117,11 @@ in { | |||
117 | 117 | ||
118 | server { | 118 | server { |
119 | listen *:80; | 119 | listen *:80; |
120 | #listen *:443 ssl; | 120 | listen *:443 ssl; |
121 | listen [::]:80; | 121 | listen [::]:80; |
122 | #listen [::]:443 ssl; | 122 | listen [::]:443 ssl; |
123 | #ssl_certificate /etc/nginx/ssl/git.yggdrasil.li/fullchain.pem; | 123 | ssl_certificate /etc/nginx/ssl/git.yggdrasil.li/fullchain.pem; |
124 | #ssl_certificate_key /etc/nginx/ssl/git.yggdrasil.li/privkey.pem; | 124 | ssl_certificate_key /etc/nginx/ssl/git.yggdrasil.li/key.pem; |
125 | server_name git.yggdrasil.li; | 125 | server_name git.yggdrasil.li; |
126 | 126 | ||
127 | root ${pkgs.cgit}/cgit; | 127 | root ${pkgs.cgit}/cgit; |