fix permissions issue with wait for api script

Author: kiriwalawren

modules/arr-common/mkArrServiceModule.nix

@@ -7,7 +7,7 @@
 with lib; let
   inherit (config) nixflix;
   inherit (nixflix) globals;
-  cfg = config.nixflix.${serviceName};
+  cfg = nixflix.${serviceName};
   stateDir = "${nixflix.stateDir}/${serviceName}";
 
   mkWaitForApiScript = import ./mkWaitForApiScript.nix {inherit lib pkgs;};
@@ -63,16 +63,16 @@ with lib; let
             method = "Forms";
           };
           server = {
-            inherit (config.nixflix.${serviceName}.config.hostConfig) port urlBase;
+            inherit (nixflix.${serviceName}.config.hostConfig) port urlBase;
           };
         } // lib.optionalAttrs config.services.postgresql.enable {
           log.dbEnabled = true;
           postgres = {
-            user = config.nixflix.${serviceName}.user;
+            user = nixflix.${serviceName}.user;
             host = "/run/postgresql";
             port = 5432;
-            mainDb = config.nixflix.${serviceName}.user;
-            logDb = config.nixflix.${serviceName}.user;
+            mainDb = nixflix.${serviceName}.user;
+            logDb = nixflix.${serviceName}.user;
           };
         }
       '';
@@ -184,15 +184,15 @@ in {
       mediaDirs = mkOption {
         type = types.listOf types.path;
         default = [];
-        defaultText = literalExpression ''[config.nixflix.mediaDir + "/<media-type>"]'';
+        defaultText = literalExpression ''[nixflix.mediaDir + "/<media-type>"]'';
         description = "List of media directories to create and manage";
       };
     };
 
   config = mkIf (nixflix.enable && cfg.enable) {
     assertions = [
       {
-        assertion = cfg.vpn.enable -> config.nixflix.mullvad.enable;
+        assertion = cfg.vpn.enable -> nixflix.mullvad.enable;
         message = "Cannot enable VPN routing for ${capitalizedName} (nixflix.${serviceName}.vpn.enable = true) when Mullvad VPN is disabled. Please set nixflix.mullvad.enable = true.";
       }
     ];
@@ -228,14 +228,14 @@ in {
           );
         };
         downloadClients = mkDefault (
-          optionals (config.nixflix.sabnzbd.enable or false) [
+          optionals (nixflix.sabnzbd.enable or false) [
             {
               name = "SABnzbd";
               implementationName = "SABnzbd";
-              inherit (config.nixflix.sabnzbd) apiKeyPath;
-              inherit (config.nixflix.sabnzbd.settings) host;
-              inherit (config.nixflix.sabnzbd.settings) port;
-              urlBase = config.nixflix.sabnzbd.settings.url_base;
+              inherit (nixflix.sabnzbd) apiKeyPath;
+              inherit (nixflix.sabnzbd.settings) host;
+              inherit (nixflix.sabnzbd.settings) port;
+              urlBase = nixflix.sabnzbd.settings.url_base;
             }
           ]
         );
@@ -337,11 +337,11 @@ in {
             ["network.target"]
             ++ (optional (cfg.config.apiKeyPath != null && cfg.config.hostConfig.passwordPath != null) "${serviceName}-env.service")
             ++ (optional config.services.postgresql.enable "postgresql-ready.target")
-            ++ (optional config.nixflix.mullvad.enable "mullvad-config.service");
+            ++ (optional nixflix.mullvad.enable "mullvad-config.service");
           requires =
             (optional (cfg.config.apiKeyPath != null && cfg.config.hostConfig.passwordPath != null) "${serviceName}-env.service")
             ++ (optional config.services.postgresql.enable "postgresql-ready.target");
-          wants = optional config.nixflix.mullvad.enable "mullvad-config.service";
+          wants = optional nixflix.mullvad.enable "mullvad-config.service";
           wantedBy = ["multi-user.target"];
 
           serviceConfig =
@@ -356,7 +356,7 @@ in {
             // optionalAttrs (cfg.config.apiKeyPath != null && cfg.config.hostConfig.passwordPath != null) {
               EnvironmentFile = "/run/${serviceName}/env";
             }
-            // optionalAttrs (config.nixflix.mullvad.enable && !cfg.vpn.enable) {
+            // optionalAttrs (nixflix.mullvad.enable && !cfg.vpn.enable) {
               ExecStart = mkForce (pkgs.writeShellScript "${serviceName}-vpn-bypass" ''
                 exec /run/wrappers/bin/mullvad-exclude ${getExe cfg.package} \
                   -nobrowser -data='${stateDir}'

modules/arr-common/mkWaitForApiScript.nix

@@ -4,8 +4,15 @@
 }: serviceName: serviceConfig:
 pkgs.writeShellScript "${serviceName}-wait-for-api" (let
   capitalizedName = lib.toUpper (builtins.substring 0 1 serviceName) + builtins.substring 1 (-1) serviceName;
+  screamingName = lib.toUpper serviceName;
+  apiKeyEnvVar = screamingName + "__AUTH__APIKEY";
 in ''
-  API_KEY=$(cat ${serviceConfig.apiKeyPath})
+  if [ -n "${"$"}{${apiKeyEnvVar}:-}" ]; then
+    API_KEY="${"$"}${apiKeyEnvVar}"
+  else
+    API_KEY=$(cat ${serviceConfig.apiKeyPath})
+  fi
+
   BASE_URL="http://127.0.0.1:${builtins.toString serviceConfig.hostConfig.port}${serviceConfig.hostConfig.urlBase}/api/${serviceConfig.apiVersion}"
 
   echo "Waiting for ${capitalizedName} API to be available..."

tests/vm-tests/postgresql-integration.nix

@@ -87,10 +87,10 @@ pkgs.testers.runNixOSTest {
     machine.wait_for_unit("lidarr-wait-for-db.service", timeout=60)
 
     # Wait for all services
-    machine.wait_for_unit("prowlarr.service", timeout=60)
-    machine.wait_for_unit("sonarr.service", timeout=60)
-    machine.wait_for_unit("radarr.service", timeout=60)
-    machine.wait_for_unit("lidarr.service", timeout=60)
+    machine.wait_for_unit("prowlarr.service", timeout=120)
+    machine.wait_for_unit("sonarr.service", timeout=120)
+    machine.wait_for_unit("radarr.service", timeout=120)
+    machine.wait_for_unit("lidarr.service", timeout=120)
     machine.wait_for_open_port(9696, timeout=60)
     machine.wait_for_open_port(8989, timeout=60)
     machine.wait_for_open_port(7878, timeout=60)