diff options
Diffstat (limited to 'virtual/modules/websites/default.nix')
-rw-r--r-- | virtual/modules/websites/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/virtual/modules/websites/default.nix b/virtual/modules/websites/default.nix index f2f0be1..59b9e47 100644 --- a/virtual/modules/websites/default.nix +++ b/virtual/modules/websites/default.nix | |||
@@ -1,8 +1,5 @@ | |||
1 | { lib, pkgs, config, mylibs, myconfig, ... }: | 1 | { lib, pkgs, config, mylibs, myconfig, ... }: |
2 | let | 2 | let |
3 | mypkgs = pkgs.callPackage ../../packages.nix { | ||
4 | inherit (mylibs) checkEnv fetchedGit fetchedGithub; | ||
5 | }; | ||
6 | cfg = config.services.myWebsites; | 3 | cfg = config.services.myWebsites; |
7 | makeService = name: cfg: let | 4 | makeService = name: cfg: let |
8 | toVhost = vhostConf: { | 5 | toVhost = vhostConf: { |
@@ -205,7 +202,7 @@ in | |||
205 | }; | 202 | }; |
206 | ldap = { | 203 | ldap = { |
207 | modules = [ "ldap" "authnz_ldap" ]; | 204 | modules = [ "ldap" "authnz_ldap" ]; |
208 | extraConfig = assert mylibs.checkEnv "NIXOPS_HTTP_LDAP_PASSWORD"; '' | 205 | extraConfig = '' |
209 | <IfModule ldap_module> | 206 | <IfModule ldap_module> |
210 | LDAPSharedCacheSize 500000 | 207 | LDAPSharedCacheSize 500000 |
211 | LDAPCacheEntries 1024 | 208 | LDAPCacheEntries 1024 |
@@ -218,7 +215,7 @@ in | |||
218 | <IfModule authnz_ldap_module> | 215 | <IfModule authnz_ldap_module> |
219 | AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS | 216 | AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS |
220 | AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu | 217 | AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu |
221 | AuthLDAPBindPassword "${builtins.getEnv "NIXOPS_HTTP_LDAP_PASSWORD"}" | 218 | AuthLDAPBindPassword "${myconfig.env.httpd.ldap.password}" |
222 | AuthType Basic | 219 | AuthType Basic |
223 | AuthName "Authentification requise (Acces LDAP)" | 220 | AuthName "Authentification requise (Acces LDAP)" |
224 | AuthBasicProvider ldap | 221 | AuthBasicProvider ldap |