-{ stdenv, fetchurl, gettext, writeText, checkEnv }:
+{ stdenv, fetchurl, gettext, writeText, env }:
let
awl = stdenv.mkDerivation rec {
version = "0.59";
'';
};
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;
'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',