Merge branch 'master' of ssh://git.fudo.org:2222/fudo-nix/entities

This commit is contained in:
2023-06-06 10:08:01 -07:00
18 changed files with 147 additions and 28 deletions
+6 -5
View File
@@ -24,9 +24,10 @@
postgresql-server = "nutboy3";
log-aggregator = "nutboy3";
chat-server = "legatus";
backplane = {
nameserver = "legatus";
dns-service = "nutboy3";
domain = "fudo.link";
};
# backplane = {
# nameserver = "legatus";
# dns-service = "nutboy3";
# domain = "fudo.link";
# };
nexus.domains = [ "fudo.link" ];
}
+1
View File
@@ -21,4 +21,5 @@
dns-service = "nutboy3";
domain = "fudo.link";
};
nexus.domains = [ "fudo.link" ];
}
+7
View File
@@ -8,10 +8,16 @@
admin-email = "niten@fudo.org";
zone = "sea.fudo.org";
gssapi-realm = "SEA.FUDO.ORG";
ldap-servers = [ "nutboy3" "legatus" ];
<<<<<<< HEAD
postgresql-server = "nostromo";
=======
kerberos-master = "nostromo";
# kerberos-slaves = [ "lambda" ];
>>>>>>> 45f0457328e0bdf5dbc6c103af0d703d46d9a2b2
prometheus-hosts = [ "limina" ];
grafana-hosts = [ "nostromo" ];
@@ -20,4 +26,5 @@
dns-service = "nutboy3";
domain = "fudo.link";
};
nexus.domains = [ "fudo.link" ];
}