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/evariste | |
| parent | 441da8aac378f401625e82caf281fa0e26128310 (diff) | |
| download | Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip | |
Upgrade nixos
Diffstat (limited to 'modules/private/websites/evariste')
| -rw-r--r-- | modules/private/websites/evariste/production.nix | 50 |
1 files changed, 24 insertions, 26 deletions
diff --git a/modules/private/websites/evariste/production.nix b/modules/private/websites/evariste/production.nix index 00e6fe1..43b26c8 100644 --- a/modules/private/websites/evariste/production.nix +++ b/modules/private/websites/evariste/production.nix | |||
| @@ -21,20 +21,19 @@ in { | |||
| 21 | ''; | 21 | ''; |
| 22 | }; | 22 | }; |
| 23 | services.phpfpm.pools.nsievariste = { | 23 | services.phpfpm.pools.nsievariste = { |
| 24 | listen = "/run/phpfpm/nsievariste.sock"; | 24 | user = "wwwrun"; |
| 25 | extraConfig = '' | 25 | group = "wwwrun"; |
| 26 | user = wwwrun | 26 | settings = { |
| 27 | group = wwwrun | 27 | "listen.owner" = "wwwrun"; |
| 28 | listen.owner = wwwrun | 28 | "listen.group" = "wwwrun"; |
| 29 | listen.group = wwwrun | ||
| 30 | 29 | ||
| 31 | pm = ondemand | 30 | "pm" = "ondemand"; |
| 32 | pm.max_children = 5 | 31 | "pm.max_children" = "5"; |
| 33 | pm.process_idle_timeout = 60 | 32 | "pm.process_idle_timeout" = "60"; |
| 34 | 33 | ||
| 35 | php_admin_value[open_basedir] = "/var/lib/php/sessions/nsievariste:${nsiVarDir}:/tmp" | 34 | "php_admin_value[open_basedir]" = "/var/lib/php/sessions/nsievariste:${nsiVarDir}:/tmp"; |
| 36 | php_admin_value[session.save_path] = "/var/lib/php/sessions/nsievariste" | 35 | "php_admin_value[session.save_path]" = "/var/lib/php/sessions/nsievariste"; |
| 37 | ''; | 36 | }; |
| 38 | }; | 37 | }; |
| 39 | services.websites.env.production.vhostConfs.nsievariste = { | 38 | services.websites.env.production.vhostConfs.nsievariste = { |
| 40 | certName = "eldiron"; | 39 | certName = "eldiron"; |
| @@ -46,7 +45,7 @@ in { | |||
| 46 | Use Stats nsievariste.immae.eu | 45 | Use Stats nsievariste.immae.eu |
| 47 | 46 | ||
| 48 | <FilesMatch "\.php$"> | 47 | <FilesMatch "\.php$"> |
| 49 | SetHandler "proxy:unix:/run/phpfpm/nsievariste.sock|fcgi://localhost" | 48 | SetHandler "proxy:unix:${config.services.phpfpm.pools.nsievariste.socket}|fcgi://localhost" |
| 50 | </FilesMatch> | 49 | </FilesMatch> |
| 51 | 50 | ||
| 52 | <Directory ${nsiVarDir}> | 51 | <Directory ${nsiVarDir}> |
| @@ -60,20 +59,19 @@ in { | |||
| 60 | }; | 59 | }; |
| 61 | 60 | ||
| 62 | services.phpfpm.pools.stmgevariste = { | 61 | services.phpfpm.pools.stmgevariste = { |
| 63 | listen = "/run/phpfpm/stmgevariste.sock"; | 62 | user = "wwwrun"; |
| 64 | extraConfig = '' | 63 | group = "wwwrun"; |
| 65 | user = wwwrun | 64 | settings = { |
| 66 | group = wwwrun | 65 | "listen.owner" = "wwwrun"; |
| 67 | listen.owner = wwwrun | 66 | "listen.group" = "wwwrun"; |
| 68 | listen.group = wwwrun | ||
| 69 | 67 | ||
| 70 | pm = ondemand | 68 | "pm" = "ondemand"; |
| 71 | pm.max_children = 5 | 69 | "pm.max_children" = "5"; |
| 72 | pm.process_idle_timeout = 60 | 70 | "pm.process_idle_timeout" = "60"; |
| 73 | 71 | ||
| 74 | php_admin_value[open_basedir] = "/var/lib/php/sessions/stmgevariste:${stmgVarDir}:/tmp" | 72 | "php_admin_value[open_basedir]" = "/var/lib/php/sessions/stmgevariste:${stmgVarDir}:/tmp"; |
| 75 | php_admin_value[session.save_path] = "/var/lib/php/sessions/stmgevariste" | 73 | "php_admin_value[session.save_path]" = "/var/lib/php/sessions/stmgevariste"; |
| 76 | ''; | 74 | }; |
| 77 | }; | 75 | }; |
| 78 | services.websites.env.production.vhostConfs.stmgevariste = { | 76 | services.websites.env.production.vhostConfs.stmgevariste = { |
| 79 | certName = "eldiron"; | 77 | certName = "eldiron"; |
| @@ -85,7 +83,7 @@ in { | |||
| 85 | Use Stats stmgevariste.immae.eu | 83 | Use Stats stmgevariste.immae.eu |
| 86 | 84 | ||
| 87 | <FilesMatch "\.php$"> | 85 | <FilesMatch "\.php$"> |
| 88 | SetHandler "proxy:unix:/run/phpfpm/stmgevariste.sock|fcgi://localhost" | 86 | SetHandler "proxy:unix:${config.services.phpfpm.pools.stmgevariste.socket}|fcgi://localhost" |
| 89 | </FilesMatch> | 87 | </FilesMatch> |
| 90 | 88 | ||
| 91 | <Directory ${stmgVarDir}> | 89 | <Directory ${stmgVarDir}> |