From 9f5ce4c77abab41930c3890d1e191a07209abd33 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 5 Mar 2016 12:57:46 +0100
Subject: tv nginx: expose /etc/os-release

---
 tv/1systems/nomic.nix             |  2 +-
 tv/1systems/wu.nix                |  2 +-
 tv/1systems/xu.nix                |  2 +-
 tv/2configs/default.nix           |  1 +
 tv/2configs/nginx-public_html.nix | 15 ---------------
 tv/2configs/nginx/default.nix     | 17 +++++++++++++++++
 tv/2configs/nginx/public_html.nix | 15 +++++++++++++++
 7 files changed, 36 insertions(+), 18 deletions(-)
 delete mode 100644 tv/2configs/nginx-public_html.nix
 create mode 100644 tv/2configs/nginx/default.nix
 create mode 100644 tv/2configs/nginx/public_html.nix

diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index fa9c908..fed67a1 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -12,7 +12,7 @@ with config.krebs.lib;
     ../2configs/git.nix
     ../2configs/im.nix
     ../2configs/mail-client.nix
-    ../2configs/nginx-public_html.nix
+    ../2configs/nginx/public_html.nix
     ../2configs/pulse.nix
     ../2configs/retiolum.nix
     ../2configs/wu-binary-cache/client.nix
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 0bf2421..f64918a 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -13,7 +13,7 @@ with config.krebs.lib;
     ../2configs/im.nix
     ../2configs/mail-client.nix
     ../2configs/man.nix
-    ../2configs/nginx-public_html.nix
+    ../2configs/nginx/public_html.nix
     ../2configs/pulse.nix
     ../2configs/retiolum.nix
     ../2configs/wu-binary-cache
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 46fb59f..6ab8f2d 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -12,7 +12,7 @@ with config.krebs.lib;
     ../2configs/git.nix
     ../2configs/mail-client.nix
     ../2configs/man.nix
-    ../2configs/nginx-public_html.nix
+    ../2configs/nginx/public_html.nix
     ../2configs/pulse.nix
     ../2configs/retiolum.nix
     ../2configs/wu-binary-cache/client.nix
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 0a3e40a..df5d5da 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -26,6 +26,7 @@ with config.krebs.lib;
   imports = [
     <secrets>
     ./backup.nix
+    ./nginx
     ./vim.nix
     {
       # stockholm dependencies
diff --git a/tv/2configs/nginx-public_html.nix b/tv/2configs/nginx-public_html.nix
deleted file mode 100644
index 15a3b54..0000000
--- a/tv/2configs/nginx-public_html.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, ... }:
-
-with config.krebs.lib;
-
-{
-  krebs.nginx = {
-    enable = true;
-    servers.default.locations = [
-      (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
-        alias /home/$1/public_html$2;
-      '')
-    ];
-  };
-  tv.iptables.input-internet-accept-new-tcp = singleton "http";
-}
diff --git a/tv/2configs/nginx/default.nix b/tv/2configs/nginx/default.nix
new file mode 100644
index 0000000..1fac65a
--- /dev/null
+++ b/tv/2configs/nginx/default.nix
@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+
+with config.krebs.lib;
+
+{
+  krebs.nginx = {
+    servers.default.locations = [
+      (nameValuePair "= /etc/os-release" ''
+        default_type text/plain;
+        alias /etc/os-release;
+      '')
+    ];
+  };
+  tv.iptables = optionalAttrs config.krebs.nginx.enable {
+    input-retiolum-accept-new-tcp = singleton "http";
+  };
+}
diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
new file mode 100644
index 0000000..15a3b54
--- /dev/null
+++ b/tv/2configs/nginx/public_html.nix
@@ -0,0 +1,15 @@
+{ config, lib, ... }:
+
+with config.krebs.lib;
+
+{
+  krebs.nginx = {
+    enable = true;
+    servers.default.locations = [
+      (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
+        alias /home/$1/public_html$2;
+      '')
+    ];
+  };
+  tv.iptables.input-internet-accept-new-tcp = singleton "http";
+}
-- 
cgit v1.2.3