X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Fdav%2Fdavical.nix;h=5eb3fab71e5f43c4a0190e7cbb10f4041d805df4;hb=441da8aac378f401625e82caf281fa0e26128310;hp=98cebee9f6e9beb1f8a72bfc76c6df782464ce53;hpb=4288c2f2431fb782b0d512b1b3749187f2374b6a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix
index 98cebee..5eb3fab 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",
@@ -113,7 +113,6 @@ rec {
     basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ];
     socket = "/var/run/phpfpm/davical.sock";
     pool = ''
-      listen = ${socket}
       user = ${apache.user}
       group = ${apache.group}
       listen.owner = ${apache.user}