diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-12-12 00:24:23 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-12-20 04:12:27 +0100 |
commit | ab8f306d7c2c49b8116e1af7b355ed2384617ed9 (patch) | |
tree | d1061ec0436fd096de2332a892eb984c63cb125e /modules/private/websites/chloe | |
parent | 4227853a03923e04daf3dd511a4b5a1ab5d527e7 (diff) | |
download | Nix-ab8f306d7c2c49b8116e1af7b355ed2384617ed9.tar.gz Nix-ab8f306d7c2c49b8116e1af7b355ed2384617ed9.tar.zst Nix-ab8f306d7c2c49b8116e1af7b355ed2384617ed9.zip |
Add specification for the private config file as a module.
Diffstat (limited to 'modules/private/websites/chloe')
-rw-r--r-- | modules/private/websites/chloe/builder.nix | 4 | ||||
-rw-r--r-- | modules/private/websites/chloe/integration.nix | 4 | ||||
-rw-r--r-- | modules/private/websites/chloe/production.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/modules/private/websites/chloe/builder.nix b/modules/private/websites/chloe/builder.nix index f65e9a9..f21caeb 100644 --- a/modules/private/websites/chloe/builder.nix +++ b/modules/private/websites/chloe/builder.nix | |||
@@ -39,10 +39,10 @@ rec { | |||
39 | SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu" | 39 | SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu" |
40 | SetEnv SPIP_LDAP_SEARCH_DN "${config.ldap.dn}" | 40 | SetEnv SPIP_LDAP_SEARCH_DN "${config.ldap.dn}" |
41 | SetEnv SPIP_LDAP_SEARCH_PW "${config.ldap.password}" | 41 | SetEnv SPIP_LDAP_SEARCH_PW "${config.ldap.password}" |
42 | SetEnv SPIP_LDAP_SEARCH "${config.ldap.search}" | 42 | SetEnv SPIP_LDAP_SEARCH "${config.ldap.filter}" |
43 | SetEnv SPIP_MYSQL_HOST "${config.mysql.host}" | 43 | SetEnv SPIP_MYSQL_HOST "${config.mysql.host}" |
44 | SetEnv SPIP_MYSQL_PORT "${config.mysql.port}" | 44 | SetEnv SPIP_MYSQL_PORT "${config.mysql.port}" |
45 | SetEnv SPIP_MYSQL_DB "${config.mysql.name}" | 45 | SetEnv SPIP_MYSQL_DB "${config.mysql.database}" |
46 | SetEnv SPIP_MYSQL_USER "${config.mysql.user}" | 46 | SetEnv SPIP_MYSQL_USER "${config.mysql.user}" |
47 | SetEnv SPIP_MYSQL_PASSWORD "${config.mysql.password}" | 47 | SetEnv SPIP_MYSQL_PASSWORD "${config.mysql.password}" |
48 | ''; | 48 | ''; |
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix index 00c76a5..273d1fc 100644 --- a/modules/private/websites/chloe/integration.nix +++ b/modules/private/websites/chloe/integration.nix | |||
@@ -1,8 +1,8 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | chloe = pkgs.callPackage ./builder.nix { | 3 | chloe = pkgs.callPackage ./builder.nix { |
4 | inherit (pkgs.webapps) chloe; | 4 | inherit (pkgs.webapps) chloe; |
5 | config = myconfig.env.websites.chloe.integration; | 5 | config = config.myEnv.websites.chloe.integration; |
6 | apacheUser = config.services.httpd.Inte.user; | 6 | apacheUser = config.services.httpd.Inte.user; |
7 | apacheGroup = config.services.httpd.Inte.group; | 7 | apacheGroup = config.services.httpd.Inte.group; |
8 | }; | 8 | }; |
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix index 0562de8..3d267f2 100644 --- a/modules/private/websites/chloe/production.nix +++ b/modules/private/websites/chloe/production.nix | |||
@@ -1,8 +1,8 @@ | |||
1 | { lib, pkgs, config, myconfig, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | chloe = pkgs.callPackage ./builder.nix { | 3 | chloe = pkgs.callPackage ./builder.nix { |
4 | inherit (pkgs.webapps) chloe; | 4 | inherit (pkgs.webapps) chloe; |
5 | config = myconfig.env.websites.chloe.production; | 5 | config = config.myEnv.websites.chloe.production; |
6 | apacheUser = config.services.httpd.Prod.user; | 6 | apacheUser = config.services.httpd.Prod.user; |
7 | apacheGroup = config.services.httpd.Prod.group; | 7 | apacheGroup = config.services.httpd.Prod.group; |
8 | }; | 8 | }; |