summaryrefslogtreecommitdiff
path: root/custom
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-01-24 12:26:20 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2016-01-24 12:26:20 +0100
commit94346f25829ba066e571dc951a6621e001d518d8 (patch)
tree1efbadce7d9b85054d11c9ac3013ee7bc548b0db /custom
parent3deb5a33ee217240ac87bc627007c7aa1c58b007 (diff)
downloadnixos-94346f25829ba066e571dc951a6621e001d518d8.tar
nixos-94346f25829ba066e571dc951a6621e001d518d8.tar.gz
nixos-94346f25829ba066e571dc951a6621e001d518d8.tar.bz2
nixos-94346f25829ba066e571dc951a6621e001d518d8.tar.xz
nixos-94346f25829ba066e571dc951a6621e001d518d8.zip
better nginx conf
Diffstat (limited to 'custom')
-rw-r--r--custom/simp_le.nix2
-rw-r--r--custom/ymir-nginx.nix22
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:
7domain: 7domain:
8 8
9let 9let
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