summaryrefslogtreecommitdiffstats
path: root/modules/wu
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-22 18:20:25 +0200
committertv <tv@shackspace.de>2015-06-22 18:20:25 +0200
commit964855f30bcb36869f24cb8474b9a0c44f58a736 (patch)
tree1056515620276960498f3c7455624802d6173620 /modules/wu
parentf2c8dbe4d126501e271e58c8a3ee3130c46dc0b9 (diff)
tv: modularize nginx
Diffstat (limited to 'modules/wu')
-rw-r--r--modules/wu/default.nix14
1 files changed, 13 insertions, 1 deletions
diff --git a/modules/wu/default.nix b/modules/wu/default.nix
index 76e8c6bb3..ac11f7466 100644
--- a/modules/wu/default.nix
+++ b/modules/wu/default.nix
@@ -4,6 +4,8 @@ let
lib = import ../../lib { lib = pkgs.lib; inherit pkgs; };
inherit (lib) majmin;
+
+ location = pkgs.lib.nameValuePair; # TODO this is also in modules/tv/git/cgit.nix
in
{
@@ -12,7 +14,6 @@ in
../common/nixpkgs.nix
../tv/base.nix
../tv/exim-retiolum.nix
- ../tv/nginx.nix
../tv/retiolum.nix
../tv/sanitize.nix
../tv/smartd.nix
@@ -33,6 +34,17 @@ in
];
};
}
+ {
+ imports = [ ../tv/nginx ];
+ tv.nginx = {
+ enable = true;
+ retiolum-locations = [
+ (location "~ ^/~(.+?)(/.*)?\$" ''
+ alias /home/$1/public_html$2;
+ '')
+ ];
+ };
+ }
];
nix.maxJobs = 8;
[cgit] Unable to lock slot /tmp/cgit/b6100000.lock: No such file or directory (2)