diff options
Diffstat (limited to 'virtual/modules/websites/tools/dav')
-rw-r--r-- | virtual/modules/websites/tools/dav/davical.nix | 11 | ||||
-rw-r--r-- | virtual/modules/websites/tools/dav/default.nix | 6 |
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 @@ | |||
1 | { stdenv, fetchurl, gettext, writeText, checkEnv }: | 1 | { stdenv, fetchurl, gettext, writeText, env }: |
2 | let | 2 | let |
3 | awl = stdenv.mkDerivation rec { | 3 | awl = stdenv.mkDerivation rec { |
4 | version = "0.59"; | 4 | version = "0.59"; |
@@ -16,12 +16,9 @@ let | |||
16 | ''; | 16 | ''; |
17 | }; | 17 | }; |
18 | davical = rec { | 18 | davical = rec { |
19 | config = | 19 | config = writeText "davical_config.php" '' |
20 | assert checkEnv "NIXOPS_DAVICAL_DB_PASSWORD"; | ||
21 | assert checkEnv "NIXOPS_DAVICAL_LDAP_PASSWORD"; | ||
22 | writeText "davical_config.php" '' | ||
23 | <?php | 20 | <?php |
24 | $c->pg_connect[] = "dbname=davical user=davical_app host=db-1.immae.eu password=${builtins.getEnv "NIXOPS_DAVICAL_DB_PASSWORD"}"; | 21 | $c->pg_connect[] = "dbname=davical user=davical_app host=db-1.immae.eu password=${env.postgresql.password}"; |
25 | 22 | ||
26 | $c->readonly_webdav_collections = false; | 23 | $c->readonly_webdav_collections = false; |
27 | 24 | ||
@@ -44,7 +41,7 @@ let | |||
44 | 'port' => '389', | 41 | 'port' => '389', |
45 | 'startTLS' => 'yes', | 42 | 'startTLS' => 'yes', |
46 | 'bindDN'=> 'cn=davical,ou=services,dc=immae,dc=eu', | 43 | 'bindDN'=> 'cn=davical,ou=services,dc=immae,dc=eu', |
47 | 'passDN'=> '${builtins.getEnv "NIXOPS_DAVICAL_LDAP_PASSWORD"}', | 44 | 'passDN'=> '${env.ldap.password}', |
48 | 'protocolVersion' => '3', | 45 | 'protocolVersion' => '3', |
49 | 'baseDNUsers'=> array('ou=users,dc=immae,dc=eu', 'ou=group_users,dc=immae,dc=eu'), | 46 | 'baseDNUsers'=> array('ou=users,dc=immae,dc=eu', 'ou=group_users,dc=immae,dc=eu'), |
50 | 'filterUsers' => 'memberOf=cn=users,cn=davical,ou=services,dc=immae,dc=eu', | 47 | '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 @@ | |||
1 | { lib, pkgs, config, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | infcloud = pkgs.callPackage ./infcloud.nix {}; | 3 | infcloud = pkgs.callPackage ./infcloud.nix {}; |
4 | davical = pkgs.callPackage ./davical.nix { inherit (mylibs) checkEnv; }; | 4 | davical = pkgs.callPackage ./davical.nix { |
5 | env = myconfig.env.tools.davical; | ||
6 | }; | ||
5 | 7 | ||
6 | cfg = config.services.myWebsites.tools.dav; | 8 | cfg = config.services.myWebsites.tools.dav; |
7 | in { | 9 | in { |