diff options
Diffstat (limited to 'modules/private/websites/default.nix')
-rw-r--r-- | modules/private/websites/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix index 87fdd73..16f02a7 100644 --- a/modules/private/websites/default.nix +++ b/modules/private/websites/default.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | www_root = "/run/current-system/webapps/_www"; | 3 | www_root = "/run/current-system/webapps/_www"; |
4 | theme_root = "/run/current-system/webapps/_theme"; | 4 | theme_root = "/run/current-system/webapps/_theme"; |
@@ -114,7 +114,7 @@ in | |||
114 | <IfModule authnz_ldap_module> | 114 | <IfModule authnz_ldap_module> |
115 | AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS | 115 | AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS |
116 | AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu | 116 | AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu |
117 | AuthLDAPBindPassword "${myconfig.env.httpd.ldap.password}" | 117 | AuthLDAPBindPassword "${config.myEnv.httpd.ldap.password}" |
118 | AuthType Basic | 118 | AuthType Basic |
119 | AuthName "Authentification requise (Acces LDAP)" | 119 | AuthName "Authentification requise (Acces LDAP)" |
120 | AuthBasicProvider ldap | 120 | AuthBasicProvider ldap |
@@ -154,7 +154,7 @@ in | |||
154 | adminAddr = "httpd@immae.eu"; | 154 | adminAddr = "httpd@immae.eu"; |
155 | httpdName = "Prod"; | 155 | httpdName = "Prod"; |
156 | ips = | 156 | ips = |
157 | let ips = myconfig.env.servers.eldiron.ips.production; | 157 | let ips = config.myEnv.servers.eldiron.ips.production; |
158 | in [ips.ip4] ++ (ips.ip6 or []); | 158 | in [ips.ip4] ++ (ips.ip6 or []); |
159 | modules = makeModules; | 159 | modules = makeModules; |
160 | extraConfig = makeExtraConfig; | 160 | extraConfig = makeExtraConfig; |
@@ -171,7 +171,7 @@ in | |||
171 | adminAddr = "httpd@immae.eu"; | 171 | adminAddr = "httpd@immae.eu"; |
172 | httpdName = "Inte"; | 172 | httpdName = "Inte"; |
173 | ips = | 173 | ips = |
174 | let ips = myconfig.env.servers.eldiron.ips.integration; | 174 | let ips = config.myEnv.servers.eldiron.ips.integration; |
175 | in [ips.ip4] ++ (ips.ip6 or []); | 175 | in [ips.ip4] ++ (ips.ip6 or []); |
176 | modules = makeModules; | 176 | modules = makeModules; |
177 | extraConfig = makeExtraConfig; | 177 | extraConfig = makeExtraConfig; |
@@ -188,7 +188,7 @@ in | |||
188 | adminAddr = "httpd@immae.eu"; | 188 | adminAddr = "httpd@immae.eu"; |
189 | httpdName = "Tools"; | 189 | httpdName = "Tools"; |
190 | ips = | 190 | ips = |
191 | let ips = myconfig.env.servers.eldiron.ips.main; | 191 | let ips = config.myEnv.servers.eldiron.ips.main; |
192 | in [ips.ip4] ++ (ips.ip6 or []); | 192 | in [ips.ip4] ++ (ips.ip6 or []); |
193 | modules = makeModules; | 193 | modules = makeModules; |
194 | extraConfig = makeExtraConfig ++ | 194 | extraConfig = makeExtraConfig ++ |