diff options
author | makefu <github@syntax-fehler.de> | 2016-03-10 08:03:41 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-03-10 08:03:41 +0100 |
commit | dcf8e3fb32d795c3578d0618baf1bac8e6cfd960 (patch) | |
tree | 4775737cd24b4ff2fd8a3e809950d208546fd43b /tv/2configs | |
parent | 2741e97fc0a950511961211e7aab15b5eb4eb635 (diff) | |
parent | 198407f70fdeacaae5dac6e4ec305629a5368410 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/default.nix | 1 | ||||
-rw-r--r-- | tv/2configs/exim-smarthost.nix | 3 | ||||
-rw-r--r-- | tv/2configs/nginx/default.nix | 17 | ||||
-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 0a3e40a5..df5d5da2 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 3ea01052..280d8572 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 00000000..1fac65a3 --- /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 15a3b548..15a3b548 100644 --- a/tv/2configs/nginx-public_html.nix +++ b/tv/2configs/nginx/public_html.nix |