nix
/
entities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict

This commit is contained in:
niten 2023-06-06 10:41:10 -07:00
parent 54c5e27a11
commit b15e701fd4
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
domains/sea.fudo.org.nix
View File

@ -12,12 +12,8 @@
ldap-servers = [ "nutboy3" "legatus" ]; ldap-servers = [ "nutboy3" "legatus" ];
<<<<<<< HEAD
postgresql-server = "nostromo"; postgresql-server = "nostromo";
=======
kerberos-master = "nostromo"; kerberos-master = "nostromo";
# kerberos-slaves = [ "lambda" ];
>>>>>>> 45f0457328e0bdf5dbc6c103af0d703d46d9a2b2
prometheus-hosts = [ "limina" ]; prometheus-hosts = [ "limina" ];
grafana-hosts = [ "nostromo" ]; grafana-hosts = [ "nostromo" ];