Add specification for the private config file as a module.

4 files changed, 28 insertions, 28 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;
diff --git a/modules/private/databases/openldap_replication.nix b/modules/private/databases/openldap_replication.nix
index c0c16e6..7833e31 100644
--- a/modules/private/databases/openldap_replication.nix
+++ b/modules/private/databases/openldap_replication.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, myconfig, lib, ... }:
+{ pkgs, config, lib, ... }:
 let
   cfg = config.myServices.databasesReplication.openldap;
   eldiron_schemas = pkgs.callPackage ./openldap/eldiron_schemas.nix {};
diff --git a/modules/private/databases/redis.nix b/modules/private/databases/redis.nix
index 693f402..4b26283 100644
--- a/modules/private/databases/redis.nix
+++ b/modules/private/databases/redis.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, myconfig, ... }:
+{ lib, config, pkgs, ... }:
 let
     cfg = config.myServices.databases.redis;
 in {
@@ -96,7 +96,7 @@ in {
           WorkerThreads 1
 
           Authority {
-              Auth "${myconfig.env.databases.redis.predixy.read}" {
+              Auth "${config.myEnv.databases.redis.predixy.read}" {
                   Mode read
               }
           }
@@ -105,7 +105,7 @@ in {
             Databases 16
             RefreshMethod fixed
             Group shard001 {
-              + ${myconfig.env.databases.redis.socket}
+              + ${config.myEnv.databases.redis.socket}
             }
           }
           '';
@@ -115,7 +115,7 @@ in {
         user = "spiped";
         group = "spiped";
         permissions = "0400";
-        text = myconfig.env.databases.redis.spiped_key;
+        text = config.myEnv.databases.redis.spiped_key;
       }
     ];
 
diff --git a/modules/private/databases/redis_replication.nix b/modules/private/databases/redis_replication.nix
index cc626f5..6ec52c9 100644
--- a/modules/private/databases/redis_replication.nix
+++ b/modules/private/databases/redis_replication.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, myconfig, lib, ... }:
+{ pkgs, config, lib, ... }:
 let
   cfg = config.myServices.databasesReplication.redis;
 in
@@ -63,7 +63,7 @@ in
       config.redis = {
         encrypt = true;
         source = "127.0.0.1:16379";
-        target = "${myconfig.env.servers.eldiron.ips.main.ip4}:16379";
+        target = "${config.myEnv.servers.eldiron.ips.main.ip4}:16379";
         keyfile = "${config.secrets.location}/redis/spiped_eldiron_keyfile";
       };
     };
@@ -103,7 +103,7 @@ in
         user = "spiped";
         group = "spiped";
         permissions = "0400";
-        text = myconfig.env.databases.redis.spiped_key;
+        text = config.myEnv.databases.redis.spiped_key;
       }
     ];