summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-11-07 20:12:35 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-11-07 20:12:35 +0100
commit17e246f07f9fcc89809ed81b822c11185a89b73b (patch)
treeea0558908d606b0b063606b044da556c53831823
parenta64a7b0134df5909399b925399462ac06ef1b592 (diff)
downloadnixos-17e246f07f9fcc89809ed81b822c11185a89b73b.tar
nixos-17e246f07f9fcc89809ed81b822c11185a89b73b.tar.gz
nixos-17e246f07f9fcc89809ed81b822c11185a89b73b.tar.bz2
nixos-17e246f07f9fcc89809ed81b822c11185a89b73b.tar.xz
nixos-17e246f07f9fcc89809ed81b822c11185a89b73b.zip
fixes to nginx
-rw-r--r--custom/mime.types1
-rw-r--r--ymir.nix8
2 files changed, 5 insertions, 4 deletions
diff --git a/custom/mime.types b/custom/mime.types
index 8a218b22..d723a21b 100644
--- a/custom/mime.types
+++ b/custom/mime.types
@@ -8,6 +8,7 @@ types {
8 application/x-javascript js; 8 application/x-javascript js;
9 application/atom+xml atom; 9 application/atom+xml atom;
10 application/rss+xml rss; 10 application/rss+xml rss;
11 application/jose+json json;
11 12
12 text/mathml mml; 13 text/mathml mml;
13 text/plain txt; 14 text/plain txt;
diff --git a/ymir.nix b/ymir.nix
index 2df8f902..7702d3e0 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -168,7 +168,7 @@ in {
168 services.nginx = { 168 services.nginx = {
169 enable = true; 169 enable = true;
170 httpConfig = '' 170 httpConfig = ''
171 include mime.types; 171 include /etc/nginx/mime.types;
172 default_type application/octet-stream; 172 default_type application/octet-stream;
173 173
174 log_format main 174 log_format main
@@ -202,13 +202,13 @@ in {
202 202
203 ignore_invalid_headers on; 203 ignore_invalid_headers on;
204 204
205 include hosts/*.conf; 205 include /etc/nginx/hosts/*.conf;
206 ''; 206 '';
207 }; 207 };
208 environment.etc."etc/nginx/mime.types" = { 208 environment.etc."nginx/mime.types" = {
209 source = ./custom/mime.types; 209 source = ./custom/mime.types;
210 }; 210 };
211 environment.etc."etc/nginx/hosts/dirty-haskell.conf" = { 211 environment.etc."nginx/hosts/dirty-haskell.conf" = {
212 text = '' 212 text = ''
213 server { 213 server {
214 listen *:80; 214 listen *:80;