diff options
Diffstat (limited to 'nixops/modules/websites/tools/dav/default.nix')
-rw-r--r-- | nixops/modules/websites/tools/dav/default.nix | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/nixops/modules/websites/tools/dav/default.nix b/nixops/modules/websites/tools/dav/default.nix index 2a82a1d..c24f8db 100644 --- a/nixops/modules/websites/tools/dav/default.nix +++ b/nixops/modules/websites/tools/dav/default.nix | |||
@@ -1,8 +1,23 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | infcloud = pkgs.callPackage ./infcloud.nix {}; | 3 | infcloud = rec { |
4 | webappName = "tools_infcloud"; | ||
5 | root = "/run/current-system/webapps/${webappName}"; | ||
6 | vhostConf = '' | ||
7 | Alias /carddavmate ${root} | ||
8 | Alias /caldavzap ${root} | ||
9 | Alias /infcloud ${root} | ||
10 | <Directory ${root}> | ||
11 | AllowOverride All | ||
12 | Options FollowSymlinks | ||
13 | Require all granted | ||
14 | DirectoryIndex index.html | ||
15 | </Directory> | ||
16 | ''; | ||
17 | }; | ||
4 | davical = pkgs.callPackage ./davical.nix { | 18 | davical = pkgs.callPackage ./davical.nix { |
5 | env = myconfig.env.tools.davical; | 19 | env = myconfig.env.tools.davical; |
20 | inherit (pkgs.webapps) davical awl; | ||
6 | }; | 21 | }; |
7 | 22 | ||
8 | cfg = config.services.myWebsites.tools.dav; | 23 | cfg = config.services.myWebsites.tools.dav; |
@@ -22,7 +37,7 @@ in { | |||
22 | hosts = ["dav.immae.eu" ]; | 37 | hosts = ["dav.immae.eu" ]; |
23 | root = null; | 38 | root = null; |
24 | extraConfig = [ | 39 | extraConfig = [ |
25 | infcloud.apache.vhostConf | 40 | infcloud.vhostConf |
26 | davical.apache.vhostConf | 41 | davical.apache.vhostConf |
27 | ]; | 42 | ]; |
28 | }; | 43 | }; |
@@ -34,7 +49,7 @@ in { | |||
34 | system.extraSystemBuilderCmds = '' | 49 | system.extraSystemBuilderCmds = '' |
35 | mkdir -p $out/webapps | 50 | mkdir -p $out/webapps |
36 | ln -s ${davical.webRoot} $out/webapps/${davical.apache.webappName} | 51 | ln -s ${davical.webRoot} $out/webapps/${davical.apache.webappName} |
37 | ln -s ${infcloud.webRoot} $out/webapps/${infcloud.apache.webappName} | 52 | ln -s ${pkgs.webapps.infcloud} $out/webapps/${infcloud.webappName} |
38 | ''; | 53 | ''; |
39 | }; | 54 | }; |
40 | } | 55 | } |