summaryrefslogtreecommitdiffstats
path: root/tv/2configs
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-03-05 23:50:50 +0100
committerlassulus <lass@aidsballs.de>2016-03-05 23:50:50 +0100
commit0115e0ee85c3ecc05b709d0f036253e52367a1a1 (patch)
tree997634737c8b337646cfd83b1fac2de956a823bc /tv/2configs
parent1ba917c3337c9a954e5c251b137ea3ea2ce62f81 (diff)
parent198407f70fdeacaae5dac6e4ec305629a5368410 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r--tv/2configs/default.nix1
-rw-r--r--tv/2configs/exim-smarthost.nix3
-rw-r--r--tv/2configs/nginx/default.nix17
-rw-r--r--tv/2configs/nginx/public_html.nix (renamed from tv/2configs/nginx-public_html.nix)0
4 files changed, 21 insertions, 0 deletions
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/exim-smarthost.nix b/tv/2configs/exim-smarthost.nix
index 3ea010524..280d8572b 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"
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
index 15a3b5482..15a3b5482 100644
--- a/tv/2configs/nginx-public_html.nix
+++ b/tv/2configs/nginx/public_html.nix