diff options
Diffstat (limited to 'modules/private/websites/tools/tools')
-rw-r--r-- | modules/private/websites/tools/tools/adminer.nix | 11 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 19 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/dmarc_reports.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/dokuwiki.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/grocy.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/kanboard.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/ldap.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/phpbb.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/rompr.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/shaarli.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/ttrss.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/wallabag.nix | 3 | ||||
-rw-r--r-- | modules/private/websites/tools/tools/yourls.nix | 3 |
13 files changed, 17 insertions, 46 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" |
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 1f499fb..499ef91 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -2,9 +2,7 @@ | |||
2 | let | 2 | let |
3 | flakeCompat = import ../../../../../lib/flake-compat.nix; | 3 | flakeCompat = import ../../../../../lib/flake-compat.nix; |
4 | 4 | ||
5 | adminer = pkgs.callPackage ./adminer.nix { | 5 | adminer = pkgs.callPackage ./adminer.nix {}; |
6 | inherit (pkgs.webapps) adminer; | ||
7 | }; | ||
8 | ympd = pkgs.callPackage ./ympd.nix { | 6 | ympd = pkgs.callPackage ./ympd.nix { |
9 | env = config.myEnv.tools.ympd; | 7 | env = config.myEnv.tools.ympd; |
10 | }; | 8 | }; |
@@ -429,21 +427,6 @@ in { | |||
429 | ldap = ldap.activationScript; | 427 | ldap = ldap.activationScript; |
430 | }; | 428 | }; |
431 | 429 | ||
432 | services.websites.webappDirs = { | ||
433 | _adminer = adminer.webRoot; | ||
434 | "${dmarc-reports.apache.webappName}" = dmarc-reports.webRoot; | ||
435 | "${dokuwiki.apache.webappName}" = dokuwiki.webRoot; | ||
436 | "${phpbb.apache.webappName}" = phpbb.webRoot; | ||
437 | "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs"; | ||
438 | "${rompr.apache.webappName}" = rompr.webRoot; | ||
439 | "${shaarli.apache.webappName}" = shaarli.webRoot; | ||
440 | "${ttrss.apache.webappName}" = ttrss.webRoot; | ||
441 | "${wallabag.apache.webappName}" = wallabag.webRoot; | ||
442 | "${yourls.apache.webappName}" = yourls.webRoot; | ||
443 | "${kanboard.apache.webappName}" = kanboard.webRoot; | ||
444 | "${grocy.apache.webappName}" = grocy.webRoot; | ||
445 | }; | ||
446 | |||
447 | services.websites.env.tools.watchPaths = [ | 430 | services.websites.env.tools.watchPaths = [ |
448 | config.secrets.fullPaths."webapps/tools-shaarli" | 431 | config.secrets.fullPaths."webapps/tools-shaarli" |
449 | ]; | 432 | ]; |
diff --git a/modules/private/websites/tools/tools/dmarc_reports.nix b/modules/private/websites/tools/tools/dmarc_reports.nix index 89da246..8a77b13 100644 --- a/modules/private/websites/tools/tools/dmarc_reports.nix +++ b/modules/private/websites/tools/tools/dmarc_reports.nix | |||
@@ -20,8 +20,7 @@ rec { | |||
20 | user = "wwwrun"; | 20 | user = "wwwrun"; |
21 | group = "wwwrun"; | 21 | group = "wwwrun"; |
22 | modules = [ "proxy_fcgi" ]; | 22 | modules = [ "proxy_fcgi" ]; |
23 | webappName = "tools_dmarc_reports"; | 23 | root = webRoot; |
24 | root = "/run/current-system/webapps/${webappName}"; | ||
25 | vhostConf = socket: '' | 24 | vhostConf = socket: '' |
26 | Alias /dmarc-reports "${root}" | 25 | Alias /dmarc-reports "${root}" |
27 | <Directory "${root}"> | 26 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix index 6175a68..1bcd852 100644 --- a/modules/private/websites/tools/tools/dokuwiki.nix +++ b/modules/private/websites/tools/tools/dokuwiki.nix | |||
@@ -25,8 +25,7 @@ rec { | |||
25 | user = "wwwrun"; | 25 | user = "wwwrun"; |
26 | group = "wwwrun"; | 26 | group = "wwwrun"; |
27 | modules = [ "proxy_fcgi" ]; | 27 | modules = [ "proxy_fcgi" ]; |
28 | webappName = "tools_dokuwiki"; | 28 | root = webRoot; |
29 | root = "/run/current-system/webapps/${webappName}"; | ||
30 | vhostConf = socket: '' | 29 | vhostConf = socket: '' |
31 | Alias /dokuwiki "${root}" | 30 | Alias /dokuwiki "${root}" |
32 | <Directory "${root}"> | 31 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/grocy.nix b/modules/private/websites/tools/tools/grocy.nix index a98d8ac..3c33170 100644 --- a/modules/private/websites/tools/tools/grocy.nix +++ b/modules/private/websites/tools/tools/grocy.nix | |||
@@ -16,8 +16,7 @@ rec { | |||
16 | user = "wwwrun"; | 16 | user = "wwwrun"; |
17 | group = "wwwrun"; | 17 | group = "wwwrun"; |
18 | modules = [ "proxy_fcgi" ]; | 18 | modules = [ "proxy_fcgi" ]; |
19 | webappName = "tools_grocy"; | 19 | root = webRoot; |
20 | root = "/run/current-system/webapps/${webappName}"; | ||
21 | vhostConf = socket: '' | 20 | vhostConf = socket: '' |
22 | Alias /grocy "${root}" | 21 | Alias /grocy "${root}" |
23 | <Directory "${root}"> | 22 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/kanboard.nix b/modules/private/websites/tools/tools/kanboard.nix index b2e7b65..54bbe01 100644 --- a/modules/private/websites/tools/tools/kanboard.nix +++ b/modules/private/websites/tools/tools/kanboard.nix | |||
@@ -46,8 +46,7 @@ rec { | |||
46 | user = "wwwrun"; | 46 | user = "wwwrun"; |
47 | group = "wwwrun"; | 47 | group = "wwwrun"; |
48 | modules = [ "proxy_fcgi" ]; | 48 | modules = [ "proxy_fcgi" ]; |
49 | webappName = "tools_kanboard"; | 49 | root = webRoot; |
50 | root = "/run/current-system/webapps/${webappName}"; | ||
51 | vhostConf = socket: '' | 50 | vhostConf = socket: '' |
52 | Alias /kanboard "${root}" | 51 | Alias /kanboard "${root}" |
53 | <Directory "${root}"> | 52 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/ldap.nix b/modules/private/websites/tools/tools/ldap.nix index 14920f4..2ca59f7 100644 --- a/modules/private/websites/tools/tools/ldap.nix +++ b/modules/private/websites/tools/tools/ldap.nix | |||
@@ -36,8 +36,7 @@ rec { | |||
36 | user = "wwwrun"; | 36 | user = "wwwrun"; |
37 | group = "wwwrun"; | 37 | group = "wwwrun"; |
38 | modules = [ "proxy_fcgi" ]; | 38 | modules = [ "proxy_fcgi" ]; |
39 | webappName = "tools_ldap"; | 39 | root = "${webRoot}/htdocs"; |
40 | root = "/run/current-system/webapps/${webappName}"; | ||
41 | vhostConf = socket: '' | 40 | vhostConf = socket: '' |
42 | Alias /ldap "${root}" | 41 | Alias /ldap "${root}" |
43 | <Directory "${root}"> | 42 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/phpbb.nix b/modules/private/websites/tools/tools/phpbb.nix index fa26069..e341a64 100644 --- a/modules/private/websites/tools/tools/phpbb.nix +++ b/modules/private/websites/tools/tools/phpbb.nix | |||
@@ -20,8 +20,7 @@ rec { | |||
20 | user = "wwwrun"; | 20 | user = "wwwrun"; |
21 | group = "wwwrun"; | 21 | group = "wwwrun"; |
22 | modules = [ "proxy_fcgi" ]; | 22 | modules = [ "proxy_fcgi" ]; |
23 | webappName = "tools_phpbb"; | 23 | root = webRoot; |
24 | root = "/run/current-system/webapps/${webappName}"; | ||
25 | vhostConf = socket: '' | 24 | vhostConf = socket: '' |
26 | Alias /forum "${root}" | 25 | Alias /forum "${root}" |
27 | <Directory "${root}"> | 26 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/rompr.nix b/modules/private/websites/tools/tools/rompr.nix index 106164c..9765df5 100644 --- a/modules/private/websites/tools/tools/rompr.nix +++ b/modules/private/websites/tools/tools/rompr.nix | |||
@@ -13,8 +13,7 @@ rec { | |||
13 | user = "wwwrun"; | 13 | user = "wwwrun"; |
14 | group = "wwwrun"; | 14 | group = "wwwrun"; |
15 | modules = [ "headers" "mime" "proxy_fcgi" ]; | 15 | modules = [ "headers" "mime" "proxy_fcgi" ]; |
16 | webappName = "tools_rompr"; | 16 | root = webRoot; |
17 | root = "/run/current-system/webapps/${webappName}"; | ||
18 | vhostConf = socket: '' | 17 | vhostConf = socket: '' |
19 | Alias /rompr ${root} | 18 | Alias /rompr ${root} |
20 | 19 | ||
diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix index b7126cc..f63c722 100644 --- a/modules/private/websites/tools/tools/shaarli.nix +++ b/modules/private/websites/tools/tools/shaarli.nix | |||
@@ -16,8 +16,7 @@ in rec { | |||
16 | user = "wwwrun"; | 16 | user = "wwwrun"; |
17 | group = "wwwrun"; | 17 | group = "wwwrun"; |
18 | modules = [ "proxy_fcgi" "rewrite" "env" ]; | 18 | modules = [ "proxy_fcgi" "rewrite" "env" ]; |
19 | webappName = "tools_shaarli"; | 19 | root = webRoot; |
20 | root = "/run/current-system/webapps/${webappName}"; | ||
21 | vhostConf = socket: '' | 20 | vhostConf = socket: '' |
22 | Alias /Shaarli "${root}" | 21 | Alias /Shaarli "${root}" |
23 | 22 | ||
diff --git a/modules/private/websites/tools/tools/ttrss.nix b/modules/private/websites/tools/tools/ttrss.nix index f6abae9..bee26c8 100644 --- a/modules/private/websites/tools/tools/ttrss.nix +++ b/modules/private/websites/tools/tools/ttrss.nix | |||
@@ -96,8 +96,7 @@ rec { | |||
96 | user = "wwwrun"; | 96 | user = "wwwrun"; |
97 | group = "wwwrun"; | 97 | group = "wwwrun"; |
98 | modules = [ "proxy_fcgi" ]; | 98 | modules = [ "proxy_fcgi" ]; |
99 | webappName = "tools_ttrss"; | 99 | root = webRoot; |
100 | root = "/run/current-system/webapps/${webappName}"; | ||
101 | vhostConf = socket: '' | 100 | vhostConf = socket: '' |
102 | Alias /ttrss "${root}" | 101 | Alias /ttrss "${root}" |
103 | <Directory "${root}"> | 102 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/wallabag.nix b/modules/private/websites/tools/tools/wallabag.nix index b6ad151..ceb061f 100644 --- a/modules/private/websites/tools/tools/wallabag.nix +++ b/modules/private/websites/tools/tools/wallabag.nix | |||
@@ -80,8 +80,7 @@ rec { | |||
80 | user = "wwwrun"; | 80 | user = "wwwrun"; |
81 | group = "wwwrun"; | 81 | group = "wwwrun"; |
82 | modules = [ "proxy_fcgi" ]; | 82 | modules = [ "proxy_fcgi" ]; |
83 | webappName = "tools_wallabag"; | 83 | root = webRoot; |
84 | root = "/run/current-system/webapps/${webappName}"; | ||
85 | vhostConf = socket: '' | 84 | vhostConf = socket: '' |
86 | Alias /wallabag "${root}" | 85 | Alias /wallabag "${root}" |
87 | <Directory "${root}"> | 86 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/tools/yourls.nix b/modules/private/websites/tools/tools/yourls.nix index 01ef548..3717520 100644 --- a/modules/private/websites/tools/tools/yourls.nix +++ b/modules/private/websites/tools/tools/yourls.nix | |||
@@ -44,8 +44,7 @@ rec { | |||
44 | user = "wwwrun"; | 44 | user = "wwwrun"; |
45 | group = "wwwrun"; | 45 | group = "wwwrun"; |
46 | modules = [ "proxy_fcgi" ]; | 46 | modules = [ "proxy_fcgi" ]; |
47 | webappName = "tools_yourls"; | 47 | root = webRoot; |
48 | root = "/run/current-system/webapps/${webappName}"; | ||
49 | vhostConf = socket: '' | 48 | vhostConf = socket: '' |
50 | Alias /url "${root}" | 49 | Alias /url "${root}" |
51 | <Directory "${root}"> | 50 | <Directory "${root}"> |