diff options
Diffstat (limited to 'modules/private/websites/tools/tools/adminer.nix')
-rw-r--r-- | modules/private/websites/tools/tools/adminer.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix index a4ba344..c280684 100644 --- a/modules/private/websites/tools/tools/adminer.nix +++ b/modules/private/websites/tools/tools/adminer.nix | |||
@@ -1,4 +1,4 @@ | |||
1 | { adminer, php74, myPhpPackages, lib, forcePhpSocket ? null }: | 1 | { webapps, php74, myPhpPackages, lib, forcePhpSocket ? null }: |
2 | rec { | 2 | rec { |
3 | activationScript = { | 3 | activationScript = { |
4 | deps = [ "httpd" ]; | 4 | deps = [ "httpd" ]; |
@@ -6,7 +6,7 @@ rec { | |||
6 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/adminer | 6 | install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/adminer |
7 | ''; | 7 | ''; |
8 | }; | 8 | }; |
9 | webRoot = adminer; | 9 | webRoot = webapps.adminer; |
10 | phpFpm = rec { | 10 | phpFpm = rec { |
11 | user = apache.user; | 11 | user = apache.user; |
12 | group = apache.group; | 12 | group = apache.group; |
@@ -28,11 +28,10 @@ rec { | |||
28 | user = "wwwrun"; | 28 | user = "wwwrun"; |
29 | group = "wwwrun"; | 29 | group = "wwwrun"; |
30 | modules = [ "proxy_fcgi" ]; | 30 | modules = [ "proxy_fcgi" ]; |
31 | webappName = "_adminer"; | 31 | root = webRoot; |
32 | root = "/run/current-system/webapps/${webappName}"; | ||
33 | vhostConf = socket: '' | 32 | vhostConf = socket: '' |
34 | Alias /adminer ${root} | 33 | Alias /adminer ${webRoot} |
35 | <Directory ${root}> | 34 | <Directory ${webRoot}> |
36 | DirectoryIndex index.php | 35 | DirectoryIndex index.php |
37 | <FilesMatch "\.php$"> | 36 | <FilesMatch "\.php$"> |
38 | SetHandler "proxy:unix:${if forcePhpSocket != null then forcePhpSocket else socket}|fcgi://localhost" | 37 | SetHandler "proxy:unix:${if forcePhpSocket != null then forcePhpSocket else socket}|fcgi://localhost" |