From ab8f306d7c2c49b8116e1af7b355ed2384617ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 12 Dec 2019 00:24:23 +0100
Subject: Add specification for the private config file as a module.

---
 modules/private/websites/tools/dav/davical.nix | 12 ++++++------
 modules/private/websites/tools/dav/default.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules/private/websites/tools/dav')

diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index 98cebee..2a02f5e 100644
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/modules/private/websites/tools/dav/davical.nix
@@ -32,16 +32,16 @@ rec {
       $c->authenticate_hook['optional'] = false;
       $c->authenticate_hook['call'] = 'LDAP_check';
       $c->authenticate_hook['config'] = array(
-          'host' => 'ldap.immae.eu',
+          'host' => '${env.ldap.host}',
           'port' => '389',
           'startTLS' => 'yes',
-          'bindDN'=> 'cn=davical,ou=services,dc=immae,dc=eu',
+          'bindDN'=> '${env.ldap.dn}',
           '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',
-          'baseDNGroups' => 'ou=groups,dc=immae,dc=eu',
-          'filterGroups' => 'memberOf=cn=groups,cn=davical,ou=services,dc=immae,dc=eu',
+          'baseDNUsers'=> array('ou=users,${env.ldap.base}', 'ou=group_users,${env.ldap.base}'),
+          'filterUsers' => '${env.ldap.filter}',
+          'baseDNGroups' => 'ou=groups,${env.ldap.base}',
+          'filterGroups' => 'memberOf=cn=groups,${env.ldap.dn}',
           'mapping_field' => array(
             "username" => "uid",
             "fullname" => "cn",
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index 5a0f470..d30c04a 100644
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
     infcloud = rec {
       webappName = "tools_infcloud";
@@ -16,7 +16,7 @@ let
       '';
     };
     davical = pkgs.callPackage ./davical.nix {
-      env = myconfig.env.tools.davical;
+      env = config.myEnv.tools.davical;
       inherit (pkgs.webapps) davical awl;
     };
 
-- 
cgit v1.2.3