diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-22 20:07:14 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2021-10-23 01:43:33 +0200 |
commit | 750fe5a43b957b91a26069cf8a4fe19fc7b2633c (patch) | |
tree | 79b4fb8d49ad7a38884e8453349635a7f715ad7e /modules/private/websites/tools/mail/default.nix | |
parent | fcbdf67afe262bf6b35a4047956b2f8c12a04cb1 (diff) | |
download | Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.gz Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.tar.zst Nix-750fe5a43b957b91a26069cf8a4fe19fc7b2633c.zip |
Remove webappdirs
Diffstat (limited to 'modules/private/websites/tools/mail/default.nix')
-rw-r--r-- | modules/private/websites/tools/mail/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
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 | } |