summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-03-10 08:03:41 +0100
committermakefu <github@syntax-fehler.de>2016-03-10 08:03:41 +0100
commitdcf8e3fb32d795c3578d0618baf1bac8e6cfd960 (patch)
tree4775737cd24b4ff2fd8a3e809950d208546fd43b /tv
parent2741e97fc0a950511961211e7aab15b5eb4eb635 (diff)
parent198407f70fdeacaae5dac6e4ec305629a5368410 (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/1systems/nomic.nix2
-rw-r--r--tv/1systems/wu.nix3
-rw-r--r--tv/1systems/xu.nix3
-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
7 files changed, 24 insertions, 5 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index fa9c90816..fed67a105 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 0bf242109..27dd12520 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
@@ -46,7 +46,6 @@ with config.krebs.lib;
netcat
nix-repl
nmap
- nq
p7zip
push
qrencode
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 46fb59ff3..96a0545a7 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
@@ -58,7 +58,6 @@ with config.krebs.lib;
netcat
nix-repl
nmap
- nq
p7zip
pass
qrencode
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