2 files changed, 8 insertions, 9 deletions

diff --git a/virtual/modules/websites/tools/dav/davical.nix b/virtual/modules/websites/tools/dav/davical.nix
index cf528ad..4d0639f 100644
--- a/virtual/modules/websites/tools/dav/davical.nix
+++ b/virtual/modules/websites/tools/dav/davical.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, writeText, checkEnv }:
+{ stdenv, fetchurl, gettext, writeText, env }:
 let
   awl = stdenv.mkDerivation rec {
     version = "0.59";
@@ -16,12 +16,9 @@ let
     '';
   };
   davical = rec {
-    config =
-      assert checkEnv "NIXOPS_DAVICAL_DB_PASSWORD";
-      assert checkEnv "NIXOPS_DAVICAL_LDAP_PASSWORD";
-      writeText "davical_config.php" ''
+    config = writeText "davical_config.php" ''
         <?php
-        $c->pg_connect[] = "dbname=davical user=davical_app host=db-1.immae.eu password=${builtins.getEnv "NIXOPS_DAVICAL_DB_PASSWORD"}";
+        $c->pg_connect[] = "dbname=davical user=davical_app host=db-1.immae.eu password=${env.postgresql.password}";
 
         $c->readonly_webdav_collections = false;
 
@@ -44,7 +41,7 @@ let
             'port' => '389',
             'startTLS' => 'yes',
             'bindDN'=> 'cn=davical,ou=services,dc=immae,dc=eu',
-            'passDN'=> '${builtins.getEnv "NIXOPS_DAVICAL_LDAP_PASSWORD"}',
+            'passDN'=> '${env.ldap.password}',
             'protocolVersion' => '3',
             'baseDNUsers'=> array('ou=users,dc=immae,dc=eu', 'ou=group_users,dc=immae,dc=eu'),
             'filterUsers' => 'memberOf=cn=users,cn=davical,ou=services,dc=immae,dc=eu',
diff --git a/virtual/modules/websites/tools/dav/default.nix b/virtual/modules/websites/tools/dav/default.nix
index 201da38..ef9735e 100644
--- a/virtual/modules/websites/tools/dav/default.nix
+++ b/virtual/modules/websites/tools/dav/default.nix
@@ -1,7 +1,9 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
     infcloud = pkgs.callPackage ./infcloud.nix {};
-    davical = pkgs.callPackage ./davical.nix { inherit (mylibs) checkEnv; };
+    davical = pkgs.callPackage ./davical.nix {
+      env = myconfig.env.tools.davical;
+    };
 
     cfg = config.services.myWebsites.tools.dav;
 in {