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/production.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/production.nix')
-rw-r--r-- | modules/private/websites/chloe/production.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/private/websites/chloe/production.nix b/modules/private/websites/chloe/production.nix index 578bf91..83f6c9b 100644 --- a/modules/private/websites/chloe/production.nix +++ b/modules/private/websites/chloe/production.nix | |||
@@ -19,8 +19,9 @@ in { | |||
19 | systemd.services.phpfpm-chloe_prod.after = lib.mkAfter chloe.phpFpm.serviceDeps; | 19 | systemd.services.phpfpm-chloe_prod.after = lib.mkAfter chloe.phpFpm.serviceDeps; |
20 | systemd.services.phpfpm-chloe_prod.wants = chloe.phpFpm.serviceDeps; | 20 | systemd.services.phpfpm-chloe_prod.wants = chloe.phpFpm.serviceDeps; |
21 | services.phpfpm.pools.chloe_prod = { | 21 | services.phpfpm.pools.chloe_prod = { |
22 | listen = chloe.phpFpm.socket; | 22 | user = config.services.httpd.Prod.user; |
23 | extraConfig = chloe.phpFpm.pool; | 23 | group = config.services.httpd.Prod.group; |
24 | settings = chloe.phpFpm.pool; | ||
24 | phpOptions = config.services.phpfpm.phpOptions + '' | 25 | phpOptions = config.services.phpfpm.phpOptions + '' |
25 | extension=${pkgs.php}/lib/php/extensions/mysqli.so | 26 | extension=${pkgs.php}/lib/php/extensions/mysqli.so |
26 | ''; | 27 | ''; |
@@ -39,7 +40,7 @@ in { | |||
39 | RewriteCond "%{HTTP_HOST}" "!^www\.osteopathe-cc\.fr$" [NC] | 40 | RewriteCond "%{HTTP_HOST}" "!^www\.osteopathe-cc\.fr$" [NC] |
40 | RewriteRule ^(.+)$ https://www.osteopathe-cc.fr$1 [R=302,L] | 41 | RewriteRule ^(.+)$ https://www.osteopathe-cc.fr$1 [R=302,L] |
41 | '' | 42 | '' |
42 | chloe.apache.vhostConf | 43 | (chloe.apache.vhostConf config.services.phpfpm.pools.chloe_prod.socket) |
43 | ]; | 44 | ]; |
44 | }; | 45 | }; |
45 | services.websites.env.production.watchPaths = [ | 46 | services.websites.env.production.watchPaths = [ |