tv nets: gg23 -> hkw

This commit is contained in:
tv 2020-08-19 02:30:51 +02:00
parent c61d99ccc6
commit 358633f973
4 changed files with 16 additions and 16 deletions

View File

@ -27,7 +27,7 @@
enable = true; enable = true;
virtualHosts.nix-serve = { virtualHosts.nix-serve = {
serverAliases = [ serverAliases = [
"cache.${config.krebs.build.host.name}.gg23" "cache.${config.krebs.build.host.name}.hkw"
]; ];
locations."/".extraConfig = '' locations."/".extraConfig = ''
proxy_pass http://localhost:${toString config.services.nix-serve.port}; proxy_pass http://localhost:${toString config.services.nix-serve.port};

View File

@ -16,7 +16,7 @@ with import <stockholm/lib>;
./backup.nix ./backup.nix
./bash ./bash
./htop.nix ./htop.nix
./nets/gg23.nix ./nets/hkw.nix
./nginx ./nginx
./pki ./pki
./ssh.nix ./ssh.nix

View File

@ -1,65 +1,65 @@
{ {
krebs = { krebs = {
dns.providers.gg23 = "hosts"; dns.providers.hkw = "hosts";
hosts = { hosts = {
nomic = { nomic = {
nets.gg23 = { nets.hkw = {
ip4 = { ip4 = {
addr = "10.23.1.110"; addr = "10.23.1.110";
prefix = "10.23.1.0/24"; prefix = "10.23.1.0/24";
}; };
aliases = [ aliases = [
"nomic.gg23" "nomic.hkw"
]; ];
ssh.port = 11423; ssh.port = 11423;
}; };
}; };
ok = { ok = {
external = true; external = true;
nets.gg23 = { nets.hkw = {
ip4 = { ip4 = {
addr = "10.23.1.1"; addr = "10.23.1.1";
prefix = "10.23.1.0/24"; prefix = "10.23.1.0/24";
}; };
aliases = [ aliases = [
"ok.gg23" "ok.hkw"
]; ];
}; };
}; };
wu = { wu = {
nets.gg23 = { nets.hkw = {
ip4 = { ip4 = {
addr = "10.23.1.37"; addr = "10.23.1.37";
prefix = "10.23.1.0/24"; prefix = "10.23.1.0/24";
}; };
aliases = [ aliases = [
"wu.gg23" "wu.hkw"
"cache.wu.gg23" "cache.wu.hkw"
]; ];
ssh.port = 11423; ssh.port = 11423;
}; };
}; };
xu = { xu = {
nets.gg23 = { nets.hkw = {
ip4 = { ip4 = {
addr = "10.23.1.38"; addr = "10.23.1.38";
prefix = "10.23.1.0/24"; prefix = "10.23.1.0/24";
}; };
aliases = [ aliases = [
"xu.gg23" "xu.hkw"
"cache.xu.gg23" "cache.xu.hkw"
]; ];
ssh.port = 11423; ssh.port = 11423;
}; };
}; };
zu = { zu = {
nets.gg23 = { nets.hkw = {
ip4 = { ip4 = {
addr = "10.23.1.39"; addr = "10.23.1.39";
prefix = "10.23.1.0/24"; prefix = "10.23.1.0/24";
}; };
aliases = [ aliases = [
"zu.gg23" "zu.hkw"
]; ];
ssh.port = 11423; ssh.port = 11423;
}; };

View File

@ -9,7 +9,7 @@ with import <stockholm/lib>;
serverAliases = [ serverAliases = [
"localhost" "localhost"
"${config.krebs.build.host.name}" "${config.krebs.build.host.name}"
"${config.krebs.build.host.name}.gg23" "${config.krebs.build.host.name}.hkw"
"${config.krebs.build.host.name}.r" "${config.krebs.build.host.name}.r"
]; ];
locations."~ ^/~(.+?)(/.*)?\$".extraConfig = '' locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''