summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2020-08-19 21:16:46 +0200
committerlassulus <lassulus@lassul.us>2020-08-19 21:16:46 +0200
commit0b4329eb0a24e5f6e5935f6242c7087015fdf104 (patch)
tree20b4b0302b601827c49adff0add17e66e3609cf0 /tv
parent6538131f91ce9dbedc8efaa6c1d6196ad5b0f3d6 (diff)
parent358633f9737c8327d6028ebfadf72cbb51df70fb (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/binary-cache/default.nix2
-rw-r--r--tv/2configs/default.nix1
-rw-r--r--tv/2configs/nets/hkw.nix69
-rw-r--r--tv/2configs/nginx/public_html.nix2
4 files changed, 72 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..725e63b13
--- /dev/null
+++ b/tv/2configs/nets/hkw.nix
@@ -0,0 +1,69 @@
+{
+ krebs = {
+ dns.providers.hkw = "hosts";
+ hosts = {
+ 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.39";
+ 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 = ''