X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fwebsites%2Fdefault.nix;h=16f02a75b6887be092d36c0513a77c4fe7a2fb6e;hb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;hp=87fdd73fdbf6ea725f6dd1a27aa9d943a2b57d72;hpb=4227853a03923e04daf3dd511a4b5a1ab5d527e7;p=perso%2FImmae%2FConfig%2FNix.git 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 @@ -{ lib, pkgs, config, myconfig, ... }: +{ lib, pkgs, config, ... }: let www_root = "/run/current-system/webapps/_www"; theme_root = "/run/current-system/webapps/_theme"; @@ -114,7 +114,7 @@ in AuthLDAPURL ldap://ldap.immae.eu:389/dc=immae,dc=eu STARTTLS AuthLDAPBindDN cn=httpd,ou=services,dc=immae,dc=eu - AuthLDAPBindPassword "${myconfig.env.httpd.ldap.password}" + AuthLDAPBindPassword "${config.myEnv.httpd.ldap.password}" AuthType Basic AuthName "Authentification requise (Acces LDAP)" AuthBasicProvider ldap @@ -154,7 +154,7 @@ in adminAddr = "httpd@immae.eu"; httpdName = "Prod"; ips = - let ips = myconfig.env.servers.eldiron.ips.production; + let ips = config.myEnv.servers.eldiron.ips.production; in [ips.ip4] ++ (ips.ip6 or []); modules = makeModules; extraConfig = makeExtraConfig; @@ -171,7 +171,7 @@ in adminAddr = "httpd@immae.eu"; httpdName = "Inte"; ips = - let ips = myconfig.env.servers.eldiron.ips.integration; + let ips = config.myEnv.servers.eldiron.ips.integration; in [ips.ip4] ++ (ips.ip6 or []); modules = makeModules; extraConfig = makeExtraConfig; @@ -188,7 +188,7 @@ in adminAddr = "httpd@immae.eu"; httpdName = "Tools"; ips = - let ips = myconfig.env.servers.eldiron.ips.main; + let ips = config.myEnv.servers.eldiron.ips.main; in [ips.ip4] ++ (ips.ip6 or []); modules = makeModules; extraConfig = makeExtraConfig ++