Restructure values file to separate hosts from services

This commit is contained in:
2023-01-21 19:51:10 +01:00
parent cb403a7aeb
commit ad75cb0c88
6 changed files with 37 additions and 33 deletions

View File

@@ -25,7 +25,7 @@
networking.interfaces.ens18.ipv4 = {
addresses = [
{
address = values.ildkule.ipv4;
address = values.hosts.ildkule.ipv4;
prefixLength = 25;
}
];
@@ -33,7 +33,7 @@
networking.interfaces.ens18.ipv6 = {
addresses = [
{
address = values.ildkule.ipv6;
address = values.hosts.ildkule.ipv6;
prefixLength = 64;
}
];

View File

@@ -29,11 +29,11 @@
networking.interfaces.ens18.ipv4 = {
addresses = [
{
address = values.jokum.ipv4;
address = values.hosts.jokum.ipv4;
prefixLength = 25;
}
{
address = values.turn.ipv4;
address = values.services.turn.ipv4;
prefixLength = 25;
}
];
@@ -41,11 +41,11 @@
networking.interfaces.ens18.ipv6 = {
addresses = [
{
address = values.jokum.ipv6;
address = values.hosts.jokum.ipv6;
prefixLength = 64;
}
{
address = values.turn.ipv6;
address = values.services.turn.ipv6;
prefixLength = 64;
}
];

View File

@@ -183,8 +183,8 @@ in {
(metricsPath v) ({
proxyPass = proxyPath v;
extraConfig = ''
allow ${values.ildkule.ipv4};
allow ${values.ildkule.ipv6};
allow ${values.hosts.ildkule.ipv4};
allow ${values.hosts.ildkule.ipv6};
deny all;
'';
}))
@@ -194,8 +194,8 @@ in {
locations."/metrics/master/1" = {
proxyPass = "http://127.0.0.1:9000/_synapse/metrics";
extraConfig = ''
allow ${values.ildkule.ipv4};
allow ${values.ildkule.ipv6};
allow ${values.hosts.ildkule.ipv4};
allow ${values.hosts.ildkule.ipv6};
deny all;
'';
};