diff options
Diffstat (limited to 'modules/private/websites/tools')
26 files changed, 33 insertions, 103 deletions
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index fc0aae6..44163de 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix | |||
@@ -8,8 +8,6 @@ let | |||
8 | ]); | 8 | ]); |
9 | env = config.myEnv.tools.nextcloud; | 9 | env = config.myEnv.tools.nextcloud; |
10 | varDir = "/var/lib/nextcloud"; | 10 | varDir = "/var/lib/nextcloud"; |
11 | webappName = "tools_nextcloud"; | ||
12 | apacheRoot = "/run/current-system/webapps/${webappName}"; | ||
13 | cfg = config.myServices.websites.tools.cloud; | 11 | cfg = config.myServices.websites.tools.cloud; |
14 | phpFpm = rec { | 12 | phpFpm = rec { |
15 | basedir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps); | 13 | basedir = builtins.concatStringsSep ":" ([ nextcloud varDir ] ++ nextcloud.apps); |
@@ -49,11 +47,11 @@ in { | |||
49 | certName = "eldiron"; | 47 | certName = "eldiron"; |
50 | addToCerts = true; | 48 | addToCerts = true; |
51 | hosts = ["cloud.immae.eu" ]; | 49 | hosts = ["cloud.immae.eu" ]; |
52 | root = apacheRoot; | 50 | root = nextcloud; |
53 | extraConfig = [ | 51 | extraConfig = [ |
54 | '' | 52 | '' |
55 | SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 | 53 | SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1 |
56 | <Directory ${apacheRoot}> | 54 | <Directory ${nextcloud}> |
57 | AcceptPathInfo On | 55 | AcceptPathInfo On |
58 | DirectoryIndex index.php | 56 | DirectoryIndex index.php |
59 | Options FollowSymlinks | 57 | Options FollowSymlinks |
@@ -159,11 +157,6 @@ in { | |||
159 | #install -D -m 0600 -o wwwrun -g wwwrun -T ${config.secrets.fullPaths."webapps/tools-nextcloud"} ${varDir}/config/config.php | 157 | #install -D -m 0600 -o wwwrun -g wwwrun -T ${config.secrets.fullPaths."webapps/tools-nextcloud"} ${varDir}/config/config.php |
160 | ''; | 158 | ''; |
161 | }; | 159 | }; |
162 | # FIXME: add a warning when config.php changes | ||
163 | system.extraSystemBuilderCmds = '' | ||
164 | mkdir -p $out/webapps | ||
165 | ln -s ${nextcloud} $out/webapps/${webappName} | ||
166 | ''; | ||
167 | 160 | ||
168 | services.phpfpm.pools.nextcloud = { | 161 | services.phpfpm.pools.nextcloud = { |
169 | user = "wwwrun"; | 162 | user = "wwwrun"; |
diff --git a/modules/private/websites/tools/dav/davical.nix b/modules/private/websites/tools/dav/davical.nix index 9e4056a..bc5ecf6 100644 --- a/modules/private/websites/tools/dav/davical.nix +++ b/modules/private/websites/tools/dav/davical.nix | |||
@@ -70,8 +70,7 @@ rec { | |||
70 | user = "wwwrun"; | 70 | user = "wwwrun"; |
71 | group = "wwwrun"; | 71 | group = "wwwrun"; |
72 | modules = [ "proxy_fcgi" ]; | 72 | modules = [ "proxy_fcgi" ]; |
73 | webappName = "tools_davical"; | 73 | root = webRoot; |
74 | root = "/run/current-system/webapps/${webappName}"; | ||
75 | vhostConf = socket: '' | 74 | vhostConf = socket: '' |
76 | Alias /davical "${root}" | 75 | Alias /davical "${root}" |
77 | Alias /caldav.php "${root}/caldav.php" | 76 | Alias /caldav.php "${root}/caldav.php" |
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix index c54e152..b3aa03d 100644 --- a/modules/private/websites/tools/dav/default.nix +++ b/modules/private/websites/tools/dav/default.nix | |||
@@ -1,8 +1,7 @@ | |||
1 | { lib, pkgs, config, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | infcloud = rec { | 3 | infcloud = rec { |
4 | webappName = "tools_infcloud"; | 4 | root = pkgs.webapps.infcloud; |
5 | root = "/run/current-system/webapps/${webappName}"; | ||
6 | vhostConf = '' | 5 | vhostConf = '' |
7 | Alias /carddavmate ${root} | 6 | Alias /carddavmate ${root} |
8 | Alias /caldavzap ${root} | 7 | Alias /caldavzap ${root} |
@@ -36,7 +35,7 @@ in { | |||
36 | certName = "eldiron"; | 35 | certName = "eldiron"; |
37 | addToCerts = true; | 36 | addToCerts = true; |
38 | hosts = ["dav.immae.eu" ]; | 37 | hosts = ["dav.immae.eu" ]; |
39 | root = "/run/current-system/webapps/_dav"; | 38 | root = ./www; |
40 | extraConfig = [ | 39 | extraConfig = [ |
41 | infcloud.vhostConf | 40 | infcloud.vhostConf |
42 | (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket) | 41 | (davical.apache.vhostConf config.services.phpfpm.pools.davical.socket) |
@@ -51,10 +50,6 @@ in { | |||
51 | phpPackage = pkgs.php72; | 50 | phpPackage = pkgs.php72; |
52 | }; | 51 | }; |
53 | }; | 52 | }; |
54 | |||
55 | services.websites.webappDirs._dav = ./www; | ||
56 | services.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot; | ||
57 | services.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud; | ||
58 | }; | 53 | }; |
59 | } | 54 | } |
60 | 55 | ||
diff --git a/modules/private/websites/tools/diaspora/default.nix b/modules/private/websites/tools/diaspora/default.nix index 9119ead..9afd5b9 100644 --- a/modules/private/websites/tools/diaspora/default.nix +++ b/modules/private/websites/tools/diaspora/default.nix | |||
@@ -1,7 +1,7 @@ | |||
1 | { lib, pkgs, config, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | env = config.myEnv.tools.diaspora; | 3 | env = config.myEnv.tools.diaspora; |
4 | root = "/run/current-system/webapps/tools_diaspora"; | 4 | root = "${dcfg.workdir}/public/"; |
5 | cfg = config.myServices.websites.tools.diaspora; | 5 | cfg = config.myServices.websites.tools.diaspora; |
6 | dcfg = config.services.diaspora; | 6 | dcfg = config.services.diaspora; |
7 | in { | 7 | in { |
@@ -160,10 +160,6 @@ in { | |||
160 | services.websites.env.tools.modules = [ | 160 | services.websites.env.tools.modules = [ |
161 | "headers" "proxy" "proxy_http" | 161 | "headers" "proxy" "proxy_http" |
162 | ]; | 162 | ]; |
163 | system.extraSystemBuilderCmds = '' | ||
164 | mkdir -p $out/webapps | ||
165 | ln -s ${dcfg.workdir}/public/ $out/webapps/tools_diaspora | ||
166 | ''; | ||
167 | services.websites.env.tools.vhostConfs.diaspora = { | 163 | services.websites.env.tools.vhostConfs.diaspora = { |
168 | certName = "eldiron"; | 164 | certName = "eldiron"; |
169 | addToCerts = true; | 165 | addToCerts = true; |
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix index 755bab0..8f611ee 100644 --- a/modules/private/websites/tools/git/default.nix +++ b/modules/private/websites/tools/git/default.nix | |||
@@ -20,8 +20,6 @@ in { | |||
20 | services.websites.env.tools.modules = | 20 | services.websites.env.tools.modules = |
21 | gitweb.apache.modules ++ | 21 | gitweb.apache.modules ++ |
22 | mantisbt.apache.modules; | 22 | mantisbt.apache.modules; |
23 | services.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot; | ||
24 | services.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot; | ||
25 | 23 | ||
26 | system.activationScripts.mantisbt = mantisbt.activationScript; | 24 | system.activationScripts.mantisbt = mantisbt.activationScript; |
27 | services.websites.env.tools.vhostConfs.git = { | 25 | services.websites.env.tools.vhostConfs.git = { |
diff --git a/modules/private/websites/tools/git/gitweb.nix b/modules/private/websites/tools/git/gitweb.nix index dab0c9e..ff34da5 100644 --- a/modules/private/websites/tools/git/gitweb.nix +++ b/modules/private/websites/tools/git/gitweb.nix | |||
@@ -1,7 +1,6 @@ | |||
1 | { gitweb, writeText, stdenv, coreutils, writeScript, gitolite, git, cgit, gitoliteDir, mailcap, highlight }: | 1 | { gitweb, writeText, stdenv, coreutils, writeScript, gitolite, git, cgit, gitoliteDir, mailcap, highlight }: |
2 | rec { | 2 | rec { |
3 | varDir = gitoliteDir; | 3 | varDir = gitoliteDir; |
4 | webRoot = gitweb; | ||
5 | config = writeText "gitweb.conf" '' | 4 | config = writeText "gitweb.conf" '' |
6 | $git_temp = "/tmp"; | 5 | $git_temp = "/tmp"; |
7 | 6 | ||
@@ -77,8 +76,7 @@ rec { | |||
77 | user = "wwwrun"; | 76 | user = "wwwrun"; |
78 | group = "wwwrun"; | 77 | group = "wwwrun"; |
79 | modules = [ "cgid" ]; | 78 | modules = [ "cgid" ]; |
80 | webappName = "tools_gitweb"; | 79 | root = gitweb; |
81 | root = "/run/current-system/webapps/${webappName}"; | ||
82 | vhostConf = '' | 80 | vhostConf = '' |
83 | SetEnv GIT_PROJECT_ROOT ${varDir}/repositories/ | 81 | SetEnv GIT_PROJECT_ROOT ${varDir}/repositories/ |
84 | ScriptAliasMatch \ | 82 | ScriptAliasMatch \ |
diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix index 033a651..2ef76af 100644 --- a/modules/private/websites/tools/git/mantisbt.nix +++ b/modules/private/websites/tools/git/mantisbt.nix | |||
@@ -50,8 +50,7 @@ rec { | |||
50 | user = "wwwrun"; | 50 | user = "wwwrun"; |
51 | group = "wwwrun"; | 51 | group = "wwwrun"; |
52 | modules = [ "proxy_fcgi" ]; | 52 | modules = [ "proxy_fcgi" ]; |
53 | webappName = "tools_mantisbt"; | 53 | root = webRoot; |
54 | root = "/run/current-system/webapps/${webappName}"; | ||
55 | vhostConf = socket: '' | 54 | vhostConf = socket: '' |
56 | Alias /mantisbt "${root}" | 55 | Alias /mantisbt "${root}" |
57 | <Directory "${root}"> | 56 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix index 033a587..7bc3d2d 100644 --- a/modules/private/websites/tools/mail/default.nix +++ b/modules/private/websites/tools/mail/default.nix | |||
@@ -36,12 +36,12 @@ in | |||
36 | certName = "mail"; | 36 | certName = "mail"; |
37 | addToCerts = true; | 37 | addToCerts = true; |
38 | hosts = ["mail.immae.eu"]; | 38 | hosts = ["mail.immae.eu"]; |
39 | root = "/run/current-system/webapps/_mail"; | 39 | root = ./www; |
40 | extraConfig = [ | 40 | extraConfig = [ |
41 | (rainloop.apache.vhostConf pcfg.rainloop.socket) | 41 | (rainloop.apache.vhostConf pcfg.rainloop.socket) |
42 | (roundcubemail.apache.vhostConf pcfg.roundcubemail.socket) | 42 | (roundcubemail.apache.vhostConf pcfg.roundcubemail.socket) |
43 | '' | 43 | '' |
44 | <Directory /run/current-system/webapps/_mail> | 44 | <Directory ${./www}> |
45 | Require all granted | 45 | Require all granted |
46 | Options -Indexes | 46 | Options -Indexes |
47 | </Directory> | 47 | </Directory> |
@@ -78,13 +78,6 @@ in | |||
78 | roundcubemail = roundcubemail.activationScript; | 78 | roundcubemail = roundcubemail.activationScript; |
79 | rainloop = rainloop.activationScript; | 79 | rainloop = rainloop.activationScript; |
80 | }; | 80 | }; |
81 | |||
82 | services.websites.webappDirs = { | ||
83 | _mail = ./www; | ||
84 | "${roundcubemail.apache.webappName}" = roundcubemail.webRoot; | ||
85 | "${rainloop.apache.webappName}" = rainloop.webRoot; | ||
86 | }; | ||
87 | |||
88 | }; | 81 | }; |
89 | 82 | ||
90 | } | 83 | } |
diff --git a/modules/private/websites/tools/mail/mta-sts.nix b/modules/private/websites/tools/mail/mta-sts.nix index c5f71f0..77ba2d4 100644 --- a/modules/private/websites/tools/mail/mta-sts.nix +++ b/modules/private/websites/tools/mail/mta-sts.nix | |||
@@ -33,21 +33,17 @@ let | |||
33 | in | 33 | in |
34 | { | 34 | { |
35 | config = lib.mkIf cfg.enable { | 35 | config = lib.mkIf cfg.enable { |
36 | services.websites.webappDirs = { | ||
37 | _mta-sts = root; | ||
38 | }; | ||
39 | |||
40 | services.websites.env.tools.vhostConfs.mta_sts = { | 36 | services.websites.env.tools.vhostConfs.mta_sts = { |
41 | certName = "mail"; | 37 | certName = "mail"; |
42 | addToCerts = true; | 38 | addToCerts = true; |
43 | hosts = ["mta-sts.mail.immae.eu"] ++ map (v: "mta-sts.${v.domain}") domains; | 39 | hosts = ["mta-sts.mail.immae.eu"] ++ map (v: "mta-sts.${v.domain}") domains; |
44 | root = "/run/current-system/webapps/_mta-sts"; | 40 | root = root; |
45 | extraConfig = [ | 41 | extraConfig = [ |
46 | '' | 42 | '' |
47 | RewriteEngine on | 43 | RewriteEngine on |
48 | RewriteCond %{HTTP_HOST} ^mta-sts.(.*)$ | 44 | RewriteCond %{HTTP_HOST} ^mta-sts.(.*)$ |
49 | RewriteRule ^/.well-known/mta-sts.txt$ %{DOCUMENT_ROOT}/%1.txt [L] | 45 | RewriteRule ^/.well-known/mta-sts.txt$ %{DOCUMENT_ROOT}/%1.txt [L] |
50 | <Directory /run/current-system/webapps/_mta-sts> | 46 | <Directory ${root}> |
51 | Require all granted | 47 | Require all granted |
52 | Options -Indexes | 48 | Options -Indexes |
53 | </Directory> | 49 | </Directory> |
diff --git a/modules/private/websites/tools/mail/rainloop.nix b/modules/private/websites/tools/mail/rainloop.nix index 21de5eb..20e43a1 100644 --- a/modules/private/websites/tools/mail/rainloop.nix +++ b/modules/private/websites/tools/mail/rainloop.nix | |||
@@ -14,8 +14,7 @@ rec { | |||
14 | user = "wwwrun"; | 14 | user = "wwwrun"; |
15 | group = "wwwrun"; | 15 | group = "wwwrun"; |
16 | modules = [ "proxy_fcgi" ]; | 16 | modules = [ "proxy_fcgi" ]; |
17 | webappName = "tools_rainloop"; | 17 | root = webRoot; |
18 | root = "/run/current-system/webapps/${webappName}"; | ||
19 | vhostConf = socket: '' | 18 | vhostConf = socket: '' |
20 | Alias /rainloop "${root}" | 19 | Alias /rainloop "${root}" |
21 | <Directory "${root}"> | 20 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/mail/roundcubemail.nix b/modules/private/websites/tools/mail/roundcubemail.nix index 92de28e..2661b55 100644 --- a/modules/private/websites/tools/mail/roundcubemail.nix +++ b/modules/private/websites/tools/mail/roundcubemail.nix | |||
@@ -79,8 +79,7 @@ rec { | |||
79 | user = "wwwrun"; | 79 | user = "wwwrun"; |
80 | group = "wwwrun"; | 80 | group = "wwwrun"; |
81 | modules = [ "proxy_fcgi" ]; | 81 | modules = [ "proxy_fcgi" ]; |
82 | webappName = "tools_roundcubemail"; | 82 | root = webRoot; |
83 | root = "/run/current-system/webapps/${webappName}"; | ||
84 | vhostConf = socket: '' | 83 | vhostConf = socket: '' |
85 | Alias /roundcube "${root}" | 84 | Alias /roundcube "${root}" |
86 | <Directory "${root}"> | 85 | <Directory "${root}"> |
diff --git a/modules/private/websites/tools/mastodon/default.nix b/modules/private/websites/tools/mastodon/default.nix index 87e8d72..3512cf1 100644 --- a/modules/private/websites/tools/mastodon/default.nix +++ b/modules/private/websites/tools/mastodon/default.nix | |||
@@ -1,7 +1,7 @@ | |||
1 | { lib, pkgs, config, ... }: | 1 | { lib, pkgs, config, ... }: |
2 | let | 2 | let |
3 | env = config.myEnv.tools.mastodon; | 3 | env = config.myEnv.tools.mastodon; |
4 | root = "/run/current-system/webapps/tools_mastodon"; | 4 | root = "${mcfg.workdir}/public/"; |
5 | cfg = config.myServices.websites.tools.mastodon; | 5 | cfg = config.myServices.websites.tools.mastodon; |
6 | mcfg = config.services.mastodon; | 6 | mcfg = config.services.mastodon; |
7 | in { | 7 | in { |
@@ -82,10 +82,6 @@ in { | |||
82 | services.websites.env.tools.modules = [ | 82 | services.websites.env.tools.modules = [ |
83 | "headers" "proxy" "proxy_wstunnel" "proxy_http" | 83 | "headers" "proxy" "proxy_wstunnel" "proxy_http" |
84 | ]; | 84 | ]; |
85 | system.extraSystemBuilderCmds = '' | ||
86 | mkdir -p $out/webapps | ||
87 | ln -s ${mcfg.workdir}/public/ $out/webapps/tools_mastodon | ||
88 | ''; | ||
89 | services.websites.env.tools.vhostConfs.mastodon = { | 85 | services.websites.env.tools.vhostConfs.mastodon = { |
90 | certName = "eldiron"; | 86 | certName = "eldiron"; |
91 | addToCerts = true; | 87 | addToCerts = true; |
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}"> |
diff --git a/modules/private/websites/tools/vpn/default.nix b/modules/private/websites/tools/vpn/default.nix index 4398a60..9cd499b 100644 --- a/modules/private/websites/tools/vpn/default.nix +++ b/modules/private/websites/tools/vpn/default.nix | |||
@@ -7,9 +7,7 @@ in { | |||
7 | certName = "eldiron"; | 7 | certName = "eldiron"; |
8 | addToCerts = true; | 8 | addToCerts = true; |
9 | hosts = [ "vpn.immae.eu" ]; | 9 | hosts = [ "vpn.immae.eu" ]; |
10 | root = "/run/current-system/webapps/_vpn"; | 10 | root = ./www; |
11 | }; | 11 | }; |
12 | |||
13 | services.websites.webappDirs._vpn = ./www; | ||
14 | }; | 12 | }; |
15 | } | 13 | } |