diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-03-25 11:57:48 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-03 16:25:07 +0200 |
commit | 5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch) | |
tree | 6ed072da7b1f17ac3994ffea052aa0c0822f8446 /modules/private/websites/chloe/integration.nix | |
parent | 441da8aac378f401625e82caf281fa0e26128310 (diff) | |
download | Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip |
Upgrade nixos
Diffstat (limited to 'modules/private/websites/chloe/integration.nix')
-rw-r--r-- | modules/private/websites/chloe/integration.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix index 6276eb7..caf6548 100644 --- a/modules/private/websites/chloe/integration.nix +++ b/modules/private/websites/chloe/integration.nix | |||
@@ -17,8 +17,9 @@ in { | |||
17 | systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps; | 17 | systemd.services.phpfpm-chloe_dev.after = lib.mkAfter chloe.phpFpm.serviceDeps; |
18 | systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps; | 18 | systemd.services.phpfpm-chloe_dev.wants = chloe.phpFpm.serviceDeps; |
19 | services.phpfpm.pools.chloe_dev = { | 19 | services.phpfpm.pools.chloe_dev = { |
20 | listen = chloe.phpFpm.socket; | 20 | user = config.services.httpd.Inte.user; |
21 | extraConfig = chloe.phpFpm.pool; | 21 | group = config.services.httpd.Inte.group; |
22 | settings = chloe.phpFpm.pool; | ||
22 | phpOptions = config.services.phpfpm.phpOptions + '' | 23 | phpOptions = config.services.phpfpm.phpOptions + '' |
23 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 24 | extension=${pkgs.php}/lib/php/extensions/mysqli.so |
24 | ''; | 25 | ''; |
@@ -31,7 +32,9 @@ in { | |||
31 | addToCerts = true; | 32 | addToCerts = true; |
32 | hosts = ["chloe.immae.eu" ]; | 33 | hosts = ["chloe.immae.eu" ]; |
33 | root = chloe.apache.root; | 34 | root = chloe.apache.root; |
34 | extraConfig = [ chloe.apache.vhostConf ]; | 35 | extraConfig = [ |
36 | (chloe.apache.vhostConf config.services.phpfpm.pools.chloe_dev.socket) | ||
37 | ]; | ||
35 | }; | 38 | }; |
36 | services.websites.env.integration.watchPaths = [ | 39 | services.websites.env.integration.watchPaths = [ |
37 | "/var/secrets/webapps/${chloe.app.environment}-chloe" | 40 | "/var/secrets/webapps/${chloe.app.environment}-chloe" |