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/tools/git | |
parent | 441da8aac378f401625e82caf281fa0e26128310 (diff) | |
download | Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.gz Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.tar.zst Nix-5400b9b6f65451d41a9106fae6fc00f97d83f4ef.zip |
Upgrade nixos
Diffstat (limited to 'modules/private/websites/tools/git')
-rw-r--r-- | modules/private/websites/tools/git/default.nix | 7 | ||||
-rw-r--r-- | modules/private/websites/tools/git/mantisbt.nix | 27 |
2 files changed, 16 insertions, 18 deletions
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix index 054e47b..56e4401 100644 --- a/modules/private/websites/tools/git/default.nix +++ b/modules/private/websites/tools/git/default.nix | |||
@@ -30,7 +30,7 @@ in { | |||
30 | root = gitweb.apache.root; | 30 | root = gitweb.apache.root; |
31 | extraConfig = [ | 31 | extraConfig = [ |
32 | gitweb.apache.vhostConf | 32 | gitweb.apache.vhostConf |
33 | mantisbt.apache.vhostConf | 33 | (mantisbt.apache.vhostConf config.services.phpfpm.pools.mantisbt.socket) |
34 | '' | 34 | '' |
35 | RewriteEngine on | 35 | RewriteEngine on |
36 | RewriteCond %{REQUEST_URI} ^/releases | 36 | RewriteCond %{REQUEST_URI} ^/releases |
@@ -40,8 +40,9 @@ in { | |||
40 | }; | 40 | }; |
41 | services.phpfpm.pools = { | 41 | services.phpfpm.pools = { |
42 | mantisbt = { | 42 | mantisbt = { |
43 | listen = mantisbt.phpFpm.socket; | 43 | user = config.services.httpd.Tools.user; |
44 | extraConfig = mantisbt.phpFpm.pool; | 44 | group = config.services.httpd.Tools.group; |
45 | settings = mantisbt.phpFpm.pool; | ||
45 | }; | 46 | }; |
46 | }; | 47 | }; |
47 | }; | 48 | }; |
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix index d75b022..50851aa 100644 --- a/modules/private/websites/tools/git/mantisbt.nix +++ b/modules/private/websites/tools/git/mantisbt.nix | |||
@@ -53,12 +53,12 @@ rec { | |||
53 | modules = [ "proxy_fcgi" ]; | 53 | modules = [ "proxy_fcgi" ]; |
54 | webappName = "tools_mantisbt"; | 54 | webappName = "tools_mantisbt"; |
55 | root = "/run/current-system/webapps/${webappName}"; | 55 | root = "/run/current-system/webapps/${webappName}"; |
56 | vhostConf = '' | 56 | vhostConf = socket: '' |
57 | Alias /mantisbt "${root}" | 57 | Alias /mantisbt "${root}" |
58 | <Directory "${root}"> | 58 | <Directory "${root}"> |
59 | DirectoryIndex index.php | 59 | DirectoryIndex index.php |
60 | <FilesMatch "\.php$"> | 60 | <FilesMatch "\.php$"> |
61 | SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" | 61 | SetHandler "proxy:unix:${socket}|fcgi://localhost" |
62 | </FilesMatch> | 62 | </FilesMatch> |
63 | 63 | ||
64 | AllowOverride All | 64 | AllowOverride All |
@@ -76,20 +76,17 @@ rec { | |||
76 | basedir = builtins.concatStringsSep ":" ( | 76 | basedir = builtins.concatStringsSep ":" ( |
77 | [ webRoot "/var/secrets/webapps/tools-mantisbt" ] | 77 | [ webRoot "/var/secrets/webapps/tools-mantisbt" ] |
78 | ++ webRoot.plugins); | 78 | ++ webRoot.plugins); |
79 | socket = "/var/run/phpfpm/mantisbt.sock"; | 79 | pool = { |
80 | pool = '' | 80 | "listen.owner" = apache.user; |
81 | user = ${apache.user} | 81 | "listen.group" = apache.group; |
82 | group = ${apache.group} | 82 | "pm" = "ondemand"; |
83 | listen.owner = ${apache.user} | 83 | "pm.max_children" = "60"; |
84 | listen.group = ${apache.group} | 84 | "pm.process_idle_timeout" = "60"; |
85 | pm = ondemand | ||
86 | pm.max_children = 60 | ||
87 | pm.process_idle_timeout = 60 | ||
88 | 85 | ||
89 | php_admin_value[upload_max_filesize] = 5000000 | 86 | "php_admin_value[upload_max_filesize]" = "5000000"; |
90 | 87 | ||
91 | php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt" | 88 | "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/mantisbt"; |
92 | php_admin_value[session.save_path] = "/var/lib/php/sessions/mantisbt" | 89 | "php_admin_value[session.save_path]" = "/var/lib/php/sessions/mantisbt"; |
93 | ''; | 90 | }; |
94 | }; | 91 | }; |
95 | } | 92 | } |