diff options
Diffstat (limited to 'modules/private/websites/chloe')
-rw-r--r-- | modules/private/websites/chloe/builder.nix | 1 | ||||
-rw-r--r-- | modules/private/websites/chloe/integration.nix | 12 | ||||
-rw-r--r-- | modules/private/websites/chloe/production.nix | 12 |
3 files changed, 16 insertions, 9 deletions
diff --git a/modules/private/websites/chloe/builder.nix b/modules/private/websites/chloe/builder.nix index 7b72b97..f65e9a9 100644 --- a/modules/private/websites/chloe/builder.nix +++ b/modules/private/websites/chloe/builder.nix | |||
@@ -5,7 +5,6 @@ rec { | |||
5 | serviceDeps = [ "mysql.service" ]; | 5 | serviceDeps = [ "mysql.service" ]; |
6 | socket = "/var/run/phpfpm/chloe-${app.environment}.sock"; | 6 | socket = "/var/run/phpfpm/chloe-${app.environment}.sock"; |
7 | pool = '' | 7 | pool = '' |
8 | listen = ${socket} | ||
9 | user = ${apacheUser} | 8 | user = ${apacheUser} |
10 | group = ${apacheGroup} | 9 | group = ${apacheGroup} |
11 | listen.owner = ${apacheUser} | 10 | listen.owner = ${apacheUser} |
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix index 458e414..d49a85c 100644 --- a/modules/private/websites/chloe/integration.nix +++ b/modules/private/websites/chloe/integration.nix | |||
@@ -13,11 +13,15 @@ in { | |||
13 | 13 | ||
14 | config = lib.mkIf cfg.enable { | 14 | config = lib.mkIf cfg.enable { |
15 | secrets.keys = chloe.keys; | 15 | secrets.keys = chloe.keys; |
16 | services.myPhpfpm.serviceDependencies.chloe_dev = chloe.phpFpm.serviceDeps; | 16 | systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps; |
17 | services.myPhpfpm.poolConfigs.chloe_dev = chloe.phpFpm.pool; | 17 | systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps; |
18 | services.myPhpfpm.poolPhpConfigs.chloe_dev = '' | 18 | services.phpfpm.pools.chloe_dev = { |
19 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 19 | listen = chloe.phpFpm.socket; |
20 | extraConfig = chloe.phpFpm.pool; | ||
21 | phpOptions = config.services.phpfpm.phpOptions + '' | ||
22 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | ||
20 | ''; | 23 | ''; |
24 | }; | ||
21 | system.activationScripts.chloe_dev = chloe.activationScript; | 25 | system.activationScripts.chloe_dev = chloe.activationScript; |
22 | system.extraSystemBuilderCmds = '' | 26 | system.extraSystemBuilderCmds = '' |
23 | mkdir -p $out/webapps | 27 | mkdir -p $out/webapps |
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix index 0eafebd..d4b2299 100644 --- a/modules/private/websites/chloe/production.nix +++ b/modules/private/websites/chloe/production.nix | |||
@@ -15,11 +15,15 @@ in { | |||
15 | secrets.keys = chloe.keys; | 15 | secrets.keys = chloe.keys; |
16 | services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ]; | 16 | services.webstats.sites = [ { name = "osteopathe-cc.fr"; } ]; |
17 | 17 | ||
18 | services.myPhpfpm.serviceDependencies.chloe_prod = chloe.phpFpm.serviceDeps; | 18 | systemd.services.phpfpm-chloe_prod.after = lib.mkAfter chloe.phpFpm.serviceDeps; |
19 | services.myPhpfpm.poolConfigs.chloe_prod = chloe.phpFpm.pool; | 19 | systemd.services.phpfpm-chloe_prod.wants = chloe.phpFpm.serviceDeps; |
20 | services.myPhpfpm.poolPhpConfigs.chloe_prod = '' | 20 | services.phpfpm.pools.chloe_prod = { |
21 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 21 | listen = chloe.phpFpm.socket; |
22 | extraConfig = chloe.phpFpm.pool; | ||
23 | phpOptions = config.services.phpfpm.phpOptions + '' | ||
24 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | ||
22 | ''; | 25 | ''; |
26 | }; | ||
23 | system.activationScripts.chloe_prod = chloe.activationScript; | 27 | system.activationScripts.chloe_prod = chloe.activationScript; |
24 | system.extraSystemBuilderCmds = '' | 28 | system.extraSystemBuilderCmds = '' |
25 | mkdir -p $out/webapps | 29 | mkdir -p $out/webapps |