aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/isabelle/iridologie.nix
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-03-25 11:57:48 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-03 16:25:07 +0200
commit5400b9b6f65451d41a9106fae6fc00f97d83f4ef (patch)
tree6ed072da7b1f17ac3994ffea052aa0c0822f8446 /modules/private/websites/isabelle/iridologie.nix
parent441da8aac378f401625e82caf281fa0e26128310 (diff)
downloadNix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz
Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst
Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip
Upgrade nixos
Diffstat (limited to 'modules/private/websites/isabelle/iridologie.nix')
-rw-r--r--modules/private/websites/isabelle/iridologie.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index 460bd2a..ffbf259 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -19,8 +19,9 @@ in {
19 systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps; 19 systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps;
20 systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps; 20 systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps;
21 services.phpfpm.pools.iridologie = { 21 services.phpfpm.pools.iridologie = {
22 listen = iridologie.phpFpm.socket; 22 user = config.services.httpd.Prod.user;
23 extraConfig = iridologie.phpFpm.pool; 23 group = config.services.httpd.Prod.group;
24 settings = iridologie.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}" "!^iridologie\.icommandeur\.org$" [NC] 40 RewriteCond "%{HTTP_HOST}" "!^iridologie\.icommandeur\.org$" [NC]
40 RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L] 41 RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L]
41 '' 42 ''
42 iridologie.apache.vhostConf 43 (iridologie.apache.vhostConf config.services.phpfpm.pools.iridologie.socket)
43 ]; 44 ];
44 }; 45 };
45 services.websites.env.production.watchPaths = [ 46 services.websites.env.production.watchPaths = [