diff options
Diffstat (limited to 'modules/private/websites/tools/dav')
-rw-r--r-- | modules/private/websites/tools/dav/davical.nix | 45 | ||||
-rw-r--r-- | modules/private/websites/tools/dav/default.nix | 7 |
2 files changed, 25 insertions, 27 deletions
diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix index 5eb3fab..9d6cd21 100644 --- a/modules/private/websites/tools/dav/davical.nix +++ b/modules/private/websites/tools/dav/davical.nix | |||
@@ -73,7 +73,7 @@ rec { | |||
73 | modules = [ "proxy_fcgi" ]; | 73 | modules = [ "proxy_fcgi" ]; |
74 | webappName = "tools_davical"; | 74 | webappName = "tools_davical"; |
75 | root = "/run/current-system/webapps/${webappName}"; | 75 | root = "/run/current-system/webapps/${webappName}"; |
76 | vhostConf = '' | 76 | vhostConf = socket: '' |
77 | Alias /davical "${root}" | 77 | Alias /davical "${root}" |
78 | Alias /caldav.php "${root}/caldav.php" | 78 | Alias /caldav.php "${root}/caldav.php" |
79 | <Directory "${root}"> | 79 | <Directory "${root}"> |
@@ -84,7 +84,7 @@ rec { | |||
84 | 84 | ||
85 | <FilesMatch "\.php$"> | 85 | <FilesMatch "\.php$"> |
86 | CGIPassAuth on | 86 | CGIPassAuth on |
87 | SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" | 87 | SetHandler "proxy:unix:${socket}|fcgi://localhost" |
88 | </FilesMatch> | 88 | </FilesMatch> |
89 | 89 | ||
90 | RewriteEngine On | 90 | RewriteEngine On |
@@ -111,28 +111,25 @@ rec { | |||
111 | phpFpm = rec { | 111 | phpFpm = rec { |
112 | serviceDeps = [ "postgresql.service" "openldap.service" ]; | 112 | serviceDeps = [ "postgresql.service" "openldap.service" ]; |
113 | basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; | 113 | basedir = builtins.concatStringsSep ":" [ webapp "/var/secrets/webapps/dav-davical" awl ]; |
114 | socket = "/var/run/phpfpm/davical.sock"; | 114 | pool = { |
115 | pool = '' | 115 | "listen.owner" = apache.user; |
116 | user = ${apache.user} | 116 | "listen.group" = apache.group; |
117 | group = ${apache.group} | 117 | "pm" = "dynamic"; |
118 | listen.owner = ${apache.user} | 118 | "pm.max_children" = "60"; |
119 | listen.group = ${apache.group} | 119 | "pm.start_servers" = "2"; |
120 | pm = dynamic | 120 | "pm.min_spare_servers" = "1"; |
121 | pm.max_children = 60 | 121 | "pm.max_spare_servers" = "10"; |
122 | pm.start_servers = 2 | ||
123 | pm.min_spare_servers = 1 | ||
124 | pm.max_spare_servers = 10 | ||
125 | 122 | ||
126 | ; Needed to avoid clashes in browser cookies (same domain) | 123 | # Needed to avoid clashes in browser cookies (same domain) |
127 | php_value[session.name] = DavicalPHPSESSID | 124 | "php_value[session.name]" = "DavicalPHPSESSID"; |
128 | php_admin_value[open_basedir] = "${basedir}:/tmp:/var/lib/php/sessions/davical" | 125 | "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/davical"; |
129 | php_admin_value[include_path] = "${awl}/inc:${webapp}/inc" | 126 | "php_admin_value[include_path]" = "${awl}/inc:${webapp}/inc"; |
130 | php_admin_value[session.save_path] = "/var/lib/php/sessions/davical" | 127 | "php_admin_value[session.save_path]" = "/var/lib/php/sessions/davical"; |
131 | php_flag[magic_quotes_gpc] = Off | 128 | "php_flag[magic_quotes_gpc]" = "Off"; |
132 | php_flag[register_globals] = Off | 129 | "php_flag[register_globals]" = "Off"; |
133 | php_admin_value[error_reporting] = "E_ALL & ~E_NOTICE" | 130 | "php_admin_value[error_reporting]" = "E_ALL & ~E_NOTICE"; |
134 | php_admin_value[default_charset] = "utf-8" | 131 | "php_admin_value[default_charset]" = "utf-8"; |
135 | php_flag[magic_quotes_runtime] = Off | 132 | "php_flag[magic_quotes_runtime]" = "Off"; |
136 | ''; | 133 | }; |
137 | }; | 134 | }; |
138 | } | 135 | } |
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix index 0012965..30a562c 100644 --- a/modules/private/websites/tools/dav/default.nix +++ b/modules/private/websites/tools/dav/default.nix | |||
@@ -38,14 +38,15 @@ in { | |||
38 | root = "/run/current-system/webapps/_dav"; | 38 | root = "/run/current-system/webapps/_dav"; |
39 | extraConfig = [ | 39 | extraConfig = [ |
40 | infcloud.vhostConf | 40 | infcloud.vhostConf |
41 | davical.apache.vhostConf | 41 | (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket) |
42 | ]; | 42 | ]; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | services.phpfpm.pools = { | 45 | services.phpfpm.pools = { |
46 | davical = { | 46 | davical = { |
47 | listen = davical.phpFpm.socket; | 47 | user = config.services.httpd.Tools.user; |
48 | extraConfig = davical.phpFpm.pool; | 48 | group = config.services.httpd.Tools.group; |
49 | settings = davical.phpFpm.pool; | ||
49 | }; | 50 | }; |
50 | }; | 51 | }; |
51 | 52 | ||