Add specification for the private config file as a module.

1 files changed, 20 insertions, 20 deletions

diff --git a/modules/private/databases/default.nix b/modules/private/databases/default.nix
index 7371410..8c5eb9a 100644
--- a/modules/private/databases/default.nix
+++ b/modules/private/databases/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, myconfig, nodes, ... }:
+{ lib, config, nodes, ... }:
 let
   cfg = config.myServices.databases;
 in
@@ -18,49 +18,49 @@ in
     mariadb = {
       enable = true;
       ldapConfig = {
-        inherit (myconfig.env.ldap) host base;
-        inherit (myconfig.env.databases.mysql.pam) dn filter password;
+        inherit (config.myEnv.ldap) host base;
+        inherit (config.myEnv.databases.mysql.pam) dn filter password;
       };
       replicationLdapConfig = {
-        inherit (myconfig.env.ldap) host base;
-        inherit (myconfig.env.ldap.eldiron) dn password;
+        inherit (config.myEnv.ldap) host base;
+        inherit (config.myEnv.servers.eldiron.ldap) dn password;
       };
-      credentials.root = myconfig.env.databases.mysql.systemUsers.root;
+      credentials.root = config.myEnv.databases.mysql.systemUsers.root;
     };
 
     openldap = {
-      accessFile = "${myconfig.privateFiles}/ldap.conf";
-      baseDn = myconfig.env.ldap.base;
-      rootDn = myconfig.env.ldap.root_dn;
-      rootPw = myconfig.env.ldap.root_pw;
+      accessFile = "${config.myEnv.privateFiles}/ldap.conf";
+      baseDn = config.myEnv.ldap.base;
+      rootDn = config.myEnv.ldap.root_dn;
+      rootPw = config.myEnv.ldap.root_pw;
       enable = true;
     };
 
     postgresql = {
       ldapConfig = {
-        inherit (myconfig.env.ldap) host base;
-        inherit (myconfig.env.databases.postgresql.pam) dn filter password;
+        inherit (config.myEnv.ldap) host base;
+        inherit (config.myEnv.databases.postgresql.pam) dn filter password;
       };
       replicationLdapConfig = {
-        inherit (myconfig.env.ldap) host base;
-        inherit (myconfig.env.ldap.eldiron) dn password;
+        inherit (config.myEnv.ldap) host base;
+        inherit (config.myEnv.servers.eldiron.ldap) dn password;
       };
       authorizedHosts = {
         immaeEu = [{
           ip4 = [
-            myconfig.env.servers.immaeEu.ips.main.ip4
-            myconfig.env.servers.immaeEu.ips.alt.ip4
+            config.myEnv.servers.immaeEu.ips.main.ip4
+            config.myEnv.servers.immaeEu.ips.alt.ip4
           ];
         }];
       };
       replicationHosts = {
         backup-1 = {
-          ip4 = [myconfig.env.servers.backup-1.ips.main.ip4];
-          ip6 = myconfig.env.servers.backup-1.ips.main.ip6;
+          ip4 = [config.myEnv.servers.backup-1.ips.main.ip4];
+          ip6 = config.myEnv.servers.backup-1.ips.main.ip6;
         };
         backup-2 = {
-          ip4 = [myconfig.env.servers.backup-2.ips.main.ip4];
-          ip6 = myconfig.env.servers.backup-2.ips.main.ip6;
+          ip4 = [config.myEnv.servers.backup-2.ips.main.ip4];
+          ip6 = config.myEnv.servers.backup-2.ips.main.ip6;
         };
       };
       enable = true;