summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tv/2configs/binary-cache/default.nix2
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/nets/hkw.nix (renamed from tv/2configs/nets/gg23.nix)26
-rw-r--r--tv/2configs/nginx/public_html.nix2
4 files changed, 16 insertions, 16 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 01f83482e..9db35184a 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -16,7 +16,7 @@ with import <stockholm/lib>;
./backup.nix
./bash
./htop.nix
- ./nets/gg23.nix
+ ./nets/hkw.nix
./nginx
./pki
./ssh.nix
diff --git a/tv/2configs/nets/gg23.nix b/tv/2configs/nets/hkw.nix
index fc5d239d5..725e63b13 100644
--- a/tv/2configs/nets/gg23.nix
+++ b/tv/2configs/nets/hkw.nix
@@ -1,65 +1,65 @@
{
krebs = {
- dns.providers.gg23 = "hosts";
+ dns.providers.hkw = "hosts";
hosts = {
nomic = {
- nets.gg23 = {
+ nets.hkw = {
ip4 = {
addr = "10.23.1.110";
prefix = "10.23.1.0/24";
};
aliases = [
- "nomic.gg23"
+ "nomic.hkw"
];
ssh.port = 11423;
};
};
ok = {
external = true;
- nets.gg23 = {
+ nets.hkw = {
ip4 = {
addr = "10.23.1.1";
prefix = "10.23.1.0/24";
};
aliases = [
- "ok.gg23"
+ "ok.hkw"
];
};
};
wu = {
- nets.gg23 = {
+ nets.hkw = {
ip4 = {
addr = "10.23.1.37";
prefix = "10.23.1.0/24";
};
aliases = [
- "wu.gg23"
- "cache.wu.gg23"
+ "wu.hkw"
+ "cache.wu.hkw"
];
ssh.port = 11423;
};
};
xu = {
- nets.gg23 = {
+ nets.hkw = {
ip4 = {
addr = "10.23.1.38";
prefix = "10.23.1.0/24";
};
aliases = [
- "xu.gg23"
- "cache.xu.gg23"
+ "xu.hkw"
+ "cache.xu.hkw"
];
ssh.port = 11423;
};
};
zu = {
- nets.gg23 = {
+ nets.hkw = {
ip4 = {
addr = "10.23.1.39";
prefix = "10.23.1.0/24";
};
aliases = [
- "zu.gg23"
+ "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 = ''