From 17e246f07f9fcc89809ed81b822c11185a89b73b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 7 Nov 2015 20:12:35 +0100
Subject: fixes to nginx

---
 custom/mime.types | 1 +
 ymir.nix          | 8 ++++----
 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 {
     application/x-javascript              js;
     application/atom+xml                  atom;
     application/rss+xml                   rss;
+    application/jose+json                 json;
 
     text/mathml                           mml;
     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 {
   services.nginx = {
     enable = true;
     httpConfig = ''
-      include mime.types;
+      include /etc/nginx/mime.types;
       default_type application/octet-stream;
  
       log_format main
@@ -202,13 +202,13 @@ in {
 
       ignore_invalid_headers on;
 
-      include hosts/*.conf;
+      include /etc/nginx/hosts/*.conf;
     '';
   };
-  environment.etc."etc/nginx/mime.types" = {
+  environment.etc."nginx/mime.types" = {
     source = ./custom/mime.types;
   };
-  environment.etc."etc/nginx/hosts/dirty-haskell.conf" = {
+  environment.etc."nginx/hosts/dirty-haskell.conf" = {
     text = ''
       server {
 			 listen *:80;
-- 
cgit v1.2.3