From 60a753e9d54ceef30f58b0fa689d666ebc06452d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 22 Dec 2016 21:53:09 +0100
Subject: tv public_html: add server names

---
 tv/2configs/nginx/public_html.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'tv/2configs/nginx/public_html.nix')

diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index e0bbb8d5..4c74d225 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -5,11 +5,19 @@ with import <stockholm/lib>;
 {
   krebs.nginx = {
     enable = true;
-    servers.default.locations = [
-      (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-        alias /home/$1/public_html$2;
-      '')
-    ];
+    servers.default = {
+      server-names = [
+        "localhost"
+        "${config.krebs.build.host.name}"
+        "${config.krebs.build.host.name}.r"
+        "${config.krebs.build.host.name}.retiolum"
+      ];
+      locations = [
+        (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
+          alias /home/$1/public_html$2;
+        '')
+      ];
+    };
   };
   tv.iptables.input-internet-accept-tcp = singleton "http";
 }
-- 
cgit v1.2.3


From eafa36c2b10ddf16163007aa58ed5e2444c251b6 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 23 Dec 2016 09:46:32 +0100
Subject: tv: replace krebs.nginx by services.nginx.virtualHosts

---
 tv/2configs/nginx/public_html.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'tv/2configs/nginx/public_html.nix')

diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index 4c74d225..9744da1e 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -3,20 +3,18 @@
 with import <stockholm/lib>;
 
 {
-  krebs.nginx = {
+  services.nginx = {
     enable = true;
-    servers.default = {
-      server-names = [
+    virtualHosts.default = {
+      serverAliases = [
         "localhost"
         "${config.krebs.build.host.name}"
         "${config.krebs.build.host.name}.r"
         "${config.krebs.build.host.name}.retiolum"
       ];
-      locations = [
-        (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-          alias /home/$1/public_html$2;
-        '')
-      ];
+      locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
+        alias /home/$1/public_html$2;
+      '';
     };
   };
   tv.iptables.input-internet-accept-tcp = singleton "http";
-- 
cgit v1.2.3