diff options
Diffstat (limited to 'modules/private/websites/tools/dav')
-rw-r--r-- | modules/private/websites/tools/dav/davical.nix | 12 | ||||
-rw-r--r-- | modules/private/websites/tools/dav/default.nix | 4 |
2 files changed, 8 insertions, 8 deletions
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 { | |||
32 | $c->authenticate_hook['optional'] = false; | 32 | $c->authenticate_hook['optional'] = false; |
33 | $c->authenticate_hook['call'] = 'LDAP_check'; | 33 | $c->authenticate_hook['call'] = 'LDAP_check'; |
34 | $c->authenticate_hook['config'] = array( | 34 | $c->authenticate_hook['config'] = array( |
35 | 'host' => 'ldap.immae.eu', | 35 | 'host' => '${env.ldap.host}', |
36 | 'port' => '389', | 36 | 'port' => '389', |
37 | 'startTLS' => 'yes', | 37 | 'startTLS' => 'yes', |
38 | 'bindDN'=> 'cn=davical,ou=services,dc=immae,dc=eu', | 38 | 'bindDN'=> '${env.ldap.dn}', |
39 | 'passDN'=> '${env.ldap.password}', | 39 | 'passDN'=> '${env.ldap.password}', |
40 | 'protocolVersion' => '3', | 40 | 'protocolVersion' => '3', |
41 | 'baseDNUsers'=> array('ou=users,dc=immae,dc=eu', 'ou=group_users,dc=immae,dc=eu'), | 41 | 'baseDNUsers'=> array('ou=users,${env.ldap.base}', 'ou=group_users,${env.ldap.base}'), |
42 | 'filterUsers' => 'memberOf=cn=users,cn=davical,ou=services,dc=immae,dc=eu', | 42 | 'filterUsers' => '${env.ldap.filter}', |
43 | 'baseDNGroups' => 'ou=groups,dc=immae,dc=eu', | 43 | 'baseDNGroups' => 'ou=groups,${env.ldap.base}', |
44 | 'filterGroups' => 'memberOf=cn=groups,cn=davical,ou=services,dc=immae,dc=eu', | 44 | 'filterGroups' => 'memberOf=cn=groups,${env.ldap.dn}', |
45 | 'mapping_field' => array( | 45 | 'mapping_field' => array( |
46 | "username" => "uid", | 46 | "username" => "uid", |
47 | "fullname" => "cn", | 47 | "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 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | infcloud = rec { | 3 | infcloud = rec { |
4 | webappName = "tools_infcloud"; | 4 | webappName = "tools_infcloud"; |
@@ -16,7 +16,7 @@ let | |||
16 | ''; | 16 | ''; |
17 | }; | 17 | }; |
18 | davical = pkgs.callPackage ./davical.nix { | 18 | davical = pkgs.callPackage ./davical.nix { |
19 | env = myconfig.env.tools.davical; | 19 | env = config.myEnv.tools.davical; |
20 | inherit (pkgs.webapps) davical awl; | 20 | inherit (pkgs.webapps) davical awl; |
21 | }; | 21 | }; |
22 | 22 | ||