Add specification for the private config file as a module.

1 files changed, 12 insertions, 12 deletions

diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix
index 273ad70..d42f659 100644
--- a/modules/private/buildbot/default.nix
+++ b/modules/private/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
 let
   varDir = "/var/lib/buildbot";
   buildbot_common = pkgs.python3Packages.buildPythonPackage rec {
@@ -27,8 +27,8 @@ in
     services.duplyBackup.profiles.buildbot = {
       rootDir = varDir;
     };
-    ids.uids.buildbot = myconfig.env.buildbot.user.uid;
-    ids.gids.buildbot = myconfig.env.buildbot.user.gid;
+    ids.uids.buildbot = config.myEnv.buildbot.user.uid;
+    ids.gids.buildbot = config.myEnv.buildbot.user.gid;
 
     users.groups.buildbot.gid = config.ids.gids.buildbot;
     users.users.buildbot = {
@@ -42,7 +42,7 @@ in
 
     services.websites.env.tools.watchPaths = lib.attrsets.mapAttrsToList
       (k: project: "/var/secrets/buildbot/${project.name}/webhook-httpd-include")
-      myconfig.env.buildbot.projects;
+      config.myEnv.buildbot.projects;
 
     services.websites.env.tools.vhostConfs.git.extraConfig = lib.attrsets.mapAttrsToList (k: project: ''
         RedirectMatch permanent "^/buildbot/${project.name}$" "/buildbot/${project.name}/"
@@ -64,7 +64,7 @@ in
             Include /var/secrets/buildbot/${project.name}/webhook-httpd-include
           </RequireAny>
         </Location>
-        '') myconfig.env.buildbot.projects;
+        '') config.myEnv.buildbot.projects;
 
     system.activationScripts = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       deps = [ "users" "wrappers" ];
@@ -73,7 +73,7 @@ in
 
         ${project.activationScript}
         '';
-    }) myconfig.env.buildbot.projects;
+    }) config.myEnv.buildbot.projects;
 
     secrets.keys = (
       lib.lists.flatten (
@@ -92,27 +92,27 @@ in
               permissions = "0600";
               user = "wwwrun";
               group = "wwwrun";
-              text = lib.optionalString (lib.attrsets.hasAttr "webhookTokens" project) ''
+              text = lib.optionalString (project.webhookTokens != null) ''
                 Require expr "req('Access-Key') in { ${builtins.concatStringsSep ", " (map (x: "'${x}'") project.webhookTokens)} }"
                 '';
               dest = "buildbot/${project.name}/webhook-httpd-include";
             }
           ]
-        ) myconfig.env.buildbot.projects
+        ) config.myEnv.buildbot.projects
       )
     ) ++ [
       {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
-        text = myconfig.env.buildbot.ldap.password;
+        text = config.myEnv.buildbot.ldap.password;
         dest = "buildbot/ldap";
       }
       {
         permissions = "0600";
         user = "buildbot";
         group = "buildbot";
-        text = builtins.readFile "${myconfig.privateFiles}/buildbot_ssh_key";
+        text = builtins.readFile "${config.myEnv.privateFiles}/buildbot_ssh_key";
         dest = "buildbot/ssh_key";
       }
     ];
@@ -123,7 +123,7 @@ in
         "/var/secrets/buildbot/ldap"
         "/var/secrets/buildbot/ssh_key"
       ] ++ lib.attrsets.mapAttrsToList (k: v: "/var/secrets/buildbot/${project.name}/${k}") project.secrets;
-    }) myconfig.env.buildbot.projects;
+    }) config.myEnv.buildbot.projects;
 
     systemd.services = lib.attrsets.mapAttrs' (k: project: lib.attrsets.nameValuePair "buildbot-${project.name}" {
       description = "Buildbot Continuous Integration Server ${project.name}.";
@@ -214,6 +214,6 @@ in
         WorkingDirectory = "${varDir}/${project.name}";
         ExecStart = "${buildbot}/bin/buildbot start";
       };
-    }) myconfig.env.buildbot.projects;
+    }) config.myEnv.buildbot.projects;
   };
 }