summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/1systems/nomic.nix2
-rw-r--r--tv/1systems/wu.nix2
-rw-r--r--tv/1systems/xu.nix2
-rw-r--r--tv/2configs/default.nix1
-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
6 files changed, 21 insertions, 3 deletions
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index fa9c9081..fed67a10 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 0bf24210..f64918a3 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 46fb59ff..6ab8f2d6 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 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/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