From 7a5c9631f72eeb049cd5c892d84cebd81e6a5019 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/2configs/default.nix           |  1 +
 tv/2configs/nginx-public_html.nix | 15 ---------------
 tv/2configs/nginx/default.nix     | 17 +++++++++++++++++
 tv/2configs/nginx/public_html.nix | 15 +++++++++++++++
 4 files changed, 33 insertions(+), 15 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

(limited to 'tv/2configs')

diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 0a3e40a5c..df5d5da29 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 15a3b5482..000000000
--- 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 000000000..1fac65a31
--- /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 000000000..15a3b5482
--- /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


From 0106f4ff07174592bab7bdc14679a9654b92dfab Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 5 Mar 2016 19:54:18 +0100
Subject: tv exim-smarthost: set dkim.domain

---
 tv/2configs/exim-smarthost.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'tv/2configs')

diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 3ea010524..2beaa28ef 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -5,6 +5,9 @@ with config.krebs.lib;
 {
   krebs.exim-smarthost = {
     enable = true;
+    dkim = {
+      domain = "viljetic.de";
+    };
     sender_domains = [
       "krebsco.de"
       "shackspace.de"
-- 
cgit v1.2.3


From 421f346257ac19612822b1f0fde9f21d3b5e7955 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 5 Mar 2016 20:28:08 +0100
Subject: krebs.exim-smarthost.dkim: support multiple domains

---
 tv/2configs/exim-smarthost.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tv/2configs')

diff --git a/tv/2configs/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 2beaa28ef..280d8572b 100644
--- a/tv/2configs/exim-smarthost.nix
+++ b/tv/2configs/exim-smarthost.nix
@@ -5,9 +5,9 @@ with config.krebs.lib;
 {
   krebs.exim-smarthost = {
     enable = true;
-    dkim = {
-      domain = "viljetic.de";
-    };
+    dkim = [
+      { domain = "viljetic.de"; }
+    ];
     sender_domains = [
       "krebsco.de"
       "shackspace.de"
-- 
cgit v1.2.3