X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fchloe%2Fbuilder.nix;h=bce2b4d279b72c59006fd733dd7e6118b68074e6;hb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;hp=7b72b9706fb38d9e0cff97914363f32af59a055f;hpb=f8026b6e4c869aa108f6361c8ccd50890657994d;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/chloe/builder.nix b/modules/private/websites/chloe/builder.nix
index 7b72b97..bce2b4d 100644
--- a/modules/private/websites/chloe/builder.nix
+++ b/modules/private/websites/chloe/builder.nix
@@ -3,29 +3,25 @@ rec {
app = chloe.override { inherit (config) environment; };
phpFpm = rec {
serviceDeps = [ "mysql.service" ];
- socket = "/var/run/phpfpm/chloe-${app.environment}.sock";
- pool = ''
- listen = ${socket}
- user = ${apacheUser}
- group = ${apacheGroup}
- listen.owner = ${apacheUser}
- listen.group = ${apacheGroup}
- php_admin_value[upload_max_filesize] = 20M
- php_admin_value[post_max_size] = 20M
- ;php_admin_flag[log_errors] = on
- php_admin_value[open_basedir] = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp"
- php_admin_value[session.save_path] = "${app.varDir}/phpSessions"
- ${if app.environment == "dev" then ''
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
- '' else ''
- pm = dynamic
- pm.max_children = 20
- pm.start_servers = 2
- pm.min_spare_servers = 1
- pm.max_spare_servers = 3
- ''}'';
+ pool = {
+ "listen.owner" = apacheUser;
+ "listen.group" = apacheGroup;
+ "php_admin_value[upload_max_filesize]" = "20M";
+ "php_admin_value[post_max_size]" = "20M";
+ # "php_admin_flag[log_errors]" = "on";
+ "php_admin_value[open_basedir]" = "${app.spipConfig}:${configDir}:${app}:${app.varDir}:/tmp";
+ "php_admin_value[session.save_path]" = "${app.varDir}/phpSessions";
+ } // (if app.environment == "dev" then {
+ "pm" = "ondemand";
+ "pm.max_children" = "5";
+ "pm.process_idle_timeout" = "60";
+ } else {
+ "pm" = "dynamic";
+ "pm.max_children" = "20";
+ "pm.start_servers" = "2";
+ "pm.min_spare_servers" = "1";
+ "pm.max_spare_servers" = "3";
+ });
};
keys = [{
dest = "webapps/${app.environment}-chloe";
@@ -40,10 +36,10 @@ rec {
SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu"
SetEnv SPIP_LDAP_SEARCH_DN "${config.ldap.dn}"
SetEnv SPIP_LDAP_SEARCH_PW "${config.ldap.password}"
- SetEnv SPIP_LDAP_SEARCH "${config.ldap.search}"
+ SetEnv SPIP_LDAP_SEARCH "${config.ldap.filter}"
SetEnv SPIP_MYSQL_HOST "${config.mysql.host}"
SetEnv SPIP_MYSQL_PORT "${config.mysql.port}"
- SetEnv SPIP_MYSQL_DB "${config.mysql.name}"
+ SetEnv SPIP_MYSQL_DB "${config.mysql.database}"
SetEnv SPIP_MYSQL_USER "${config.mysql.user}"
SetEnv SPIP_MYSQL_PASSWORD "${config.mysql.password}"
'';
@@ -52,7 +48,7 @@ rec {
modules = [ "proxy_fcgi" ];
webappName = "chloe_${app.environment}";
root = "/run/current-system/webapps/${webappName}";
- vhostConf = ''
+ vhostConf = socket: ''
Include /var/secrets/webapps/${app.environment}-chloe
RewriteEngine On
@@ -61,7 +57,7 @@ rec {
'' else ""}
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+ SetHandler "proxy:unix:${socket}|fcgi://localhost"