diff options
| author | makefu <github@syntax-fehler.de> | 2020-09-16 21:55:09 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2020-09-16 21:55:09 +0200 |
| commit | c64fb07027b49a3825b6f0814ebeb17782b8266a (patch) | |
| tree | e1b4681fd93a4d3257b556dd8d579464d653ef77 /tv/2configs | |
| parent | 1394ae1bd4bc3dcfb77b0daee996e75f8092fc5b (diff) | |
| parent | 88a9183d1d36424977b0cd8ed513109433b779b2 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/binary-cache/default.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/default.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/nets/hkw.nix | 81 | ||||
| -rw-r--r-- | tv/2configs/nginx/public_html.nix | 2 |
4 files changed, 84 insertions, 2 deletions
diff --git a/tv/2configs/binary-cache/default.nix b/tv/2configs/binary-cache/default.nix index 866434cb5..f6eaba36f 100644 --- a/tv/2configs/binary-cache/default.nix +++ b/tv/2configs/binary-cache/default.nix @@ -27,7 +27,7 @@ enable = true; virtualHosts.nix-serve = { serverAliases = [ - "cache.${config.krebs.build.host.name}.gg23" + "cache.${config.krebs.build.host.name}.hkw" ]; locations."/".extraConfig = '' proxy_pass http://localhost:${toString config.services.nix-serve.port}; diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 4d27b0eac..9db35184a 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -16,6 +16,7 @@ with import <stockholm/lib>; ./backup.nix ./bash ./htop.nix + ./nets/hkw.nix ./nginx ./pki ./ssh.nix diff --git a/tv/2configs/nets/hkw.nix b/tv/2configs/nets/hkw.nix new file mode 100644 index 000000000..c3acde1fb --- /dev/null +++ b/tv/2configs/nets/hkw.nix @@ -0,0 +1,81 @@ +{ + krebs = { + dns.providers.hkw = "hosts"; + hosts = { + au = { + nets.hkw = { + ip4 = { + addr = "10.23.1.39"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "au.hkw" + ]; + ssh.port = 11423; + }; + }; + nomic = { + nets.hkw = { + ip4 = { + addr = "10.23.1.110"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "nomic.hkw" + ]; + ssh.port = 11423; + }; + }; + ok = { + external = true; + nets.hkw = { + ip4 = { + addr = "10.23.1.1"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "ok.hkw" + ]; + }; + }; + wu = { + nets.hkw = { + ip4 = { + addr = "10.23.1.37"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "wu.hkw" + "cache.wu.hkw" + ]; + ssh.port = 11423; + }; + }; + xu = { + nets.hkw = { + ip4 = { + addr = "10.23.1.38"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "xu.hkw" + "cache.xu.hkw" + ]; + ssh.port = 11423; + }; + }; + zu = { + nets.hkw = { + ip4 = { + addr = "10.23.1.40"; + prefix = "10.23.1.0/24"; + }; + aliases = [ + "zu.hkw" + ]; + ssh.port = 11423; + }; + }; + }; + }; +} diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix index cc7a39891..a37498ba3 100644 --- a/tv/2configs/nginx/public_html.nix +++ b/tv/2configs/nginx/public_html.nix @@ -9,7 +9,7 @@ with import <stockholm/lib>; serverAliases = [ "localhost" "${config.krebs.build.host.name}" - "${config.krebs.build.host.name}.gg23" + "${config.krebs.build.host.name}.hkw" "${config.krebs.build.host.name}.r" ]; locations."~ ^/~(.+?)(/.*)?\$".extraConfig = '' |