2 files changed, 12 insertions, 17 deletions

diff --git a/virtual/modules/websites/tools/cloud/default.nix b/virtual/modules/websites/tools/cloud/default.nix
index 7dd5c6e..241b982 100644
--- a/virtual/modules/websites/tools/cloud/default.nix
+++ b/virtual/modules/websites/tools/cloud/default.nix
@@ -1,6 +1,8 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
-    nextcloud = pkgs.callPackage ./nextcloud.nix { inherit (mylibs) checkEnv; };
+    nextcloud = pkgs.callPackage ./nextcloud.nix {
+      env = myconfig.env.tools.nextcloud;
+    };
 
     cfg = config.services.myWebsites.tools.cloud;
 in {
diff --git a/virtual/modules/websites/tools/cloud/nextcloud.nix b/virtual/modules/websites/tools/cloud/nextcloud.nix
index b9c8d04..815254b 100644
--- a/virtual/modules/websites/tools/cloud/nextcloud.nix
+++ b/virtual/modules/websites/tools/cloud/nextcloud.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, checkEnv, writeText, lib, phpPackages, php }:
+{ stdenv, fetchurl, env, writeText, lib, phpPackages, php }:
 let
   nextcloud = let
     buildApp = { appName, version, url, sha256, installPhase ? "mkdir -p $out && cp -R . $out/" }:
@@ -96,27 +96,20 @@ let
     };
   in rec {
     varDir = "/var/lib/nextcloud";
-    config_php =
-      assert checkEnv "NIXOPS_NEXTCLOUD_PASSWORD_SALT";
-      assert checkEnv "NIXOPS_NEXTCLOUD_DB_USER";
-      assert checkEnv "NIXOPS_NEXTCLOUD_DB_PASSWORD";
-      assert checkEnv "NIXOPS_NEXTCLOUD_INSTANCE_ID";
-      assert checkEnv "NIXOPS_NEXTCLOUD_SECRET";
-      assert checkEnv "NIXOPS_NEXTCLOUD_REDIS_DB_INDEX";
-      writeText "config.php" ''
+    config_php = writeText "config.php" ''
       <?php
       $CONFIG = array (
-        'instanceid' => '${builtins.getEnv "NIXOPS_NEXTCLOUD_INSTANCE_ID"}',
+        'instanceid' => '${env.instance_id}',
         'datadirectory' => '/var/lib/nextcloud/',
-        'passwordsalt' => '${builtins.getEnv "NIXOPS_NEXTCLOUD_PASSWORD_SALT"}',
+        'passwordsalt' => '${env.password_salt}',
         'debug' => false,
         'dbtype' => 'pgsql',
         'version' => '15.0.0.10',
         'dbname' => 'webapps',
         'dbhost' => '/run/postgresql',
         'dbtableprefix' => 'oc_',
-        'dbuser' => '${builtins.getEnv "NIXOPS_NEXTCLOUD_DB_USER"}',
-        'dbpassword' => '${builtins.getEnv "NIXOPS_NEXTCLOUD_DB_PASSWORD"}',
+        'dbuser' => '${env.postgresql.user}',
+        'dbpassword' => '${env.postgresql.password}',
         'installed' => true,
         'maxZipInputSize' => 0,
         'allowZipDownload' => true,
@@ -127,7 +120,7 @@ let
         array (
           0 => 'cloud.immae.eu',
         ),
-        'secret' => '${builtins.getEnv "NIXOPS_NEXTCLOUD_SECRET"}',
+        'secret' => '${env.secret}',
         'appstoreenabled' => false,
         'appstore.experimental.enabled' => true,
         'loglevel' => 0,
@@ -147,7 +140,7 @@ let
         array (
           'host' => 'localhost',
           'port' => 6379,
-          'dbindex' => ${builtins.getEnv "NIXOPS_NEXTCLOUD_REDIS_DB_INDEX"},
+          'dbindex' => ${env.redis.db_index},
         ),
         'overwrite.cli.url' => 'https://cloud.immae.eu',
         'ldapIgnoreNamingRules' => false,