From 7a5c9631f72eeb049cd5c892d84cebd81e6a5019 Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 5 Mar 2016 12:57:46 +0100 Subject: [PATCH] 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/default.nix | 17 +++++++++++++++++ .../public_html.nix} | 0 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 tv/2configs/nginx/default.nix rename tv/2configs/{nginx-public_html.nix => nginx/public_html.nix} (100%) 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..f64918a35 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 46fb59ff3..6ab8f2d61 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 0a3e40a5c..df5d5da29 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -26,6 +26,7 @@ with config.krebs.lib; imports = [ ./backup.nix + ./nginx ./vim.nix { # stockholm dependencies 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 similarity index 100% rename from tv/2configs/nginx-public_html.nix rename to tv/2configs/nginx/public_html.nix