aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/tools
diff options
context:
space:
mode:
Diffstat (limited to 'modules/private/websites/tools')
-rw-r--r--modules/private/websites/tools/dav/default.nix6
-rw-r--r--modules/private/websites/tools/git/default.nix4
-rw-r--r--modules/private/websites/tools/mail/default.nix2
-rw-r--r--modules/private/websites/tools/mail/mta-sts.nix2
-rw-r--r--modules/private/websites/tools/tools/default.nix2
-rw-r--r--modules/private/websites/tools/vpn/default.nix2
6 files changed, 9 insertions, 9 deletions
diff --git a/modules/private/websites/tools/dav/default.nix b/modules/private/websites/tools/dav/default.nix
index 30a562c..14e4069 100644
--- a/modules/private/websites/tools/dav/default.nix
+++ b/modules/private/websites/tools/dav/default.nix
@@ -50,9 +50,9 @@ in {
50 }; 50 };
51 }; 51 };
52 52
53 myServices.websites.webappDirs._dav = ./www; 53 services.websites.webappDirs._dav = ./www;
54 myServices.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot; 54 services.websites.webappDirs."${davical.apache.webappName}" = davical.webRoot;
55 myServices.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud; 55 services.websites.webappDirs."${infcloud.webappName}" = pkgs.webapps.infcloud;
56 }; 56 };
57} 57}
58 58
diff --git a/modules/private/websites/tools/git/default.nix b/modules/private/websites/tools/git/default.nix
index 56e4401..55f9ecb 100644
--- a/modules/private/websites/tools/git/default.nix
+++ b/modules/private/websites/tools/git/default.nix
@@ -19,8 +19,8 @@ in {
19 services.websites.env.tools.modules = 19 services.websites.env.tools.modules =
20 gitweb.apache.modules ++ 20 gitweb.apache.modules ++
21 mantisbt.apache.modules; 21 mantisbt.apache.modules;
22 myServices.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot; 22 services.websites.webappDirs."${gitweb.apache.webappName}" = gitweb.webRoot;
23 myServices.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot; 23 services.websites.webappDirs."${mantisbt.apache.webappName}" = mantisbt.webRoot;
24 24
25 system.activationScripts.mantisbt = mantisbt.activationScript; 25 system.activationScripts.mantisbt = mantisbt.activationScript;
26 services.websites.env.tools.vhostConfs.git = { 26 services.websites.env.tools.vhostConfs.git = {
diff --git a/modules/private/websites/tools/mail/default.nix b/modules/private/websites/tools/mail/default.nix
index 1f7f7bf..dda2d45 100644
--- a/modules/private/websites/tools/mail/default.nix
+++ b/modules/private/websites/tools/mail/default.nix
@@ -72,7 +72,7 @@ in
72 rainloop = rainloop.activationScript; 72 rainloop = rainloop.activationScript;
73 }; 73 };
74 74
75 myServices.websites.webappDirs = { 75 services.websites.webappDirs = {
76 _mail = ./www; 76 _mail = ./www;
77 "${roundcubemail.apache.webappName}" = roundcubemail.webRoot; 77 "${roundcubemail.apache.webappName}" = roundcubemail.webRoot;
78 "${rainloop.apache.webappName}" = rainloop.webRoot; 78 "${rainloop.apache.webappName}" = rainloop.webRoot;
diff --git a/modules/private/websites/tools/mail/mta-sts.nix b/modules/private/websites/tools/mail/mta-sts.nix
index ed3fce8..c5d4306 100644
--- a/modules/private/websites/tools/mail/mta-sts.nix
+++ b/modules/private/websites/tools/mail/mta-sts.nix
@@ -34,7 +34,7 @@ let
34in 34in
35{ 35{
36 config = lib.mkIf cfg.enable { 36 config = lib.mkIf cfg.enable {
37 myServices.websites.webappDirs = { 37 services.websites.webappDirs = {
38 _mta-sts = root; 38 _mta-sts = root;
39 }; 39 };
40 40
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index d88763c..be2ee75 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -335,7 +335,7 @@ in {
335 ldap = ldap.activationScript; 335 ldap = ldap.activationScript;
336 }; 336 };
337 337
338 myServices.websites.webappDirs = { 338 services.websites.webappDirs = {
339 _adminer = adminer.webRoot; 339 _adminer = adminer.webRoot;
340 "${dokuwiki.apache.webappName}" = dokuwiki.webRoot; 340 "${dokuwiki.apache.webappName}" = dokuwiki.webRoot;
341 "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs"; 341 "${ldap.apache.webappName}" = "${ldap.webRoot}/htdocs";
diff --git a/modules/private/websites/tools/vpn/default.nix b/modules/private/websites/tools/vpn/default.nix
index cfe010c..4398a60 100644
--- a/modules/private/websites/tools/vpn/default.nix
+++ b/modules/private/websites/tools/vpn/default.nix
@@ -10,6 +10,6 @@ in {
10 root = "/run/current-system/webapps/_vpn"; 10 root = "/run/current-system/webapps/_vpn";
11 }; 11 };
12 12
13 myServices.websites.webappDirs._vpn = ./www; 13 services.websites.webappDirs._vpn = ./www;
14 }; 14 };
15} 15}