From e5899248bf45759565eb0bc2888dcedb3a6a63e8 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 7 Nov 2015 21:30:46 +0100
Subject: moved nginx config

---
 custom/ymir.nginx | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ymir.nix          | 63 +------------------------------------------------------
 2 files changed, 63 insertions(+), 62 deletions(-)
 create mode 100644 custom/ymir.nginx

diff --git a/custom/ymir.nginx b/custom/ymir.nginx
new file mode 100644
index 00000000..1fb0afcb
--- /dev/null
+++ b/custom/ymir.nginx
@@ -0,0 +1,62 @@
+default_type application/octet-stream;
+
+log_format main
+        '$remote_addr - $remote_user [$time_local] '
+        '"$request" $status $bytes_sent '
+        '"$http_referer" "$http_user_agent" '
+        '"$gzip_ratio"';
+
+client_header_timeout 10m;
+client_body_timeout 10m;
+send_timeout 10m;
+
+connection_pool_size 256;
+client_header_buffer_size 1k;
+large_client_header_buffers 4 2k;
+request_pool_size 4k;
+
+gzip on;
+gzip_min_length 1100;
+gzip_buffers 4 8k;
+gzip_types text/plain;
+
+output_buffers 1 32k;
+postpone_output 1460;
+
+sendfile on;
+tcp_nopush on;
+tcp_nodelay on;
+
+keepalive_timeout 75 20;
+
+ignore_invalid_headers on;
+
+server {
+  listen *:80;
+  listen [::]:80;
+  server_name dirty-haskell.org www.dirty-haskell.org;
+
+  root /srv/www/dirty-haskell.org;
+}
+
+server {
+  listen *:443 ssl;
+  listen [::]:443 ssl;
+  server_name dirty-haskell.org;
+
+  ssl_certificate /etc/nginx/ssl/dirty-haskell.org/fullchain.pem;
+  ssl_certificate_key /etc/nginx/ssl/dirty-haskell.org/privkey.pem;
+
+  root /srv/www/dirty-haskell.org;
+}
+
+server {
+  listen *:443 ssl;
+  listen [::]:443 ssl;
+  server_name www.dirty-haskell.org;
+
+  ssl_certificate /etc/nginx/ssl/www.dirty-haskell.org/fullchain.pem;
+  ssl_certificate_key /etc/nginx/ssl/www.dirty-haskell.org/privkey.pem;
+
+  root /srv/www/dirty-haskell.org;
+}
diff --git a/ymir.nix b/ymir.nix
index 52b6e476..808b11bb 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -167,67 +167,6 @@ in {
 
   services.nginx = {
     enable = true;
-    httpConfig = ''
-      default_type application/octet-stream;
- 
-      log_format main
-              '$remote_addr - $remote_user [$time_local] '
-              '"$request" $status $bytes_sent '
-              '"$http_referer" "$http_user_agent" '
-              '"$gzip_ratio"';
-
-      client_header_timeout 10m;
-      client_body_timeout 10m;
-      send_timeout 10m;
-
-      connection_pool_size 256;
-      client_header_buffer_size 1k;
-      large_client_header_buffers 4 2k;
-      request_pool_size 4k;
-
-      gzip on;
-      gzip_min_length 1100;
-      gzip_buffers 4 8k;
-      gzip_types text/plain;
-
-      output_buffers 1 32k;
-      postpone_output 1460;
-
-      sendfile on;
-      tcp_nopush on;
-      tcp_nodelay on;
-
-      keepalive_timeout 75 20;
-
-      ignore_invalid_headers on;
-
-      server {
-        listen *:80;
-        listen [::]:80;
-        server_name dirty-haskell.org www.dirty-haskell.org;
-
-        root /srv/www/dirty-haskell.org;
-      }
-      server {
-        listen *:443 ssl;
-        listen [::]:443 ssl;
-        server_name dirty-haskell.org;
-
-        ssl_certificate /etc/nginx/ssl/dirty-haskell.org/fullchain.pem;
-        ssl_certificate_key /etc/nginx/ssl/dirty-haskell.org/privkey.pem;
-
-        root /srv/www/dirty-haskell.org;
-      }
-      server {
-        listen *:443 ssl;
-        listen [::]:443 ssl;
-        server_name www.dirty-haskell.org;
-
-        ssl_certificate /etc/nginx/ssl/www.dirty-haskell.org/fullchain.pem;
-        ssl_certificate_key /etc/nginx/ssl/www.dirty-haskell.org/privkey.pem;
-
-        root /srv/www/dirty-haskell.org;
-      }
-    '';
+    httpConfig = builtins.readFile ./custom/ymir.nginx;
   };
 }
-- 
cgit v1.2.3