From ca22017caf8255aa214333468daff387a7e1a048 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 24 Jan 2016 12:17:46 +0100
Subject: nginx config

---
 custom/ymir-nginx.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'custom/ymir-nginx.nix')

diff --git a/custom/ymir-nginx.nix b/custom/ymir-nginx.nix
index 4c3880ce..3664ad7d 100644
--- a/custom/ymir-nginx.nix
+++ b/custom/ymir-nginx.nix
@@ -116,14 +116,21 @@ in {
       }
 
       server {
-        listen *:80;
-        listen *:443 ssl;
-        listen [::]:80;
-        listen [::]:443 ssl;
-        server_name git.yggdrasil.li www.git.yggdrasil.li;
+        http {
+          listen *:80;
+          listen *:443 ssl;
+          listen [::]:80;
+          listen [::]:443 ssl;
+          ssl_certificate /etc/nginx/ssl/git.yggdrasil.li/fullchain.pem;
+          ssl_certificate_key /etc/nginx/ssl/git.yggdrasil.li/privkey.pem;
+          server_name git.yggdrasil.li;
+        }
 
-        ssl_certificate /etc/nginx/ssl/$server_name/fullchain.pem;
-        ssl_certificate_key /etc/nginx/ssl/$server_name/privkey.pem;
+        http {
+          listen *:80;
+          listen [::]:80;
+          server_name www.git.yggdrasil.li;
+        }
 
 	root ${pkgs.cgit}/cgit;
 
-- 
cgit v1.2.3