summaryrefslogtreecommitdiffstats
path: root/tv/2configs/nginx/public_html.nix
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-12-24 15:39:37 +0100
committermakefu <github@syntax-fehler.de>2016-12-24 15:39:37 +0100
commit78c50fe49599b5c3dd147ebd23253fa2abe53998 (patch)
tree6d609ffc1c59ed6bdb35ef354c5b96de7858e778 /tv/2configs/nginx/public_html.nix
parentd385e3c6968d9317b7d8adea3671c79258a24cec (diff)
parentbece7d9da29adde2c79e49c40d975dc46eed4c1e (diff)
Merge remote-tracking branch 'tv/master'
Diffstat (limited to 'tv/2configs/nginx/public_html.nix')
-rw-r--r--tv/2configs/nginx/public_html.nix16
1 files changed, 11 insertions, 5 deletions
diff --git a/tv/2configs/nginx/public_html.nix b/tv/2configs/nginx/public_html.nix
index e0bbb8d57..9744da1e8 100644
--- a/tv/2configs/nginx/public_html.nix
+++ b/tv/2configs/nginx/public_html.nix
@@ -3,13 +3,19 @@
with import <stockholm/lib>;
{
- krebs.nginx = {
+ services.nginx = {
enable = true;
- servers.default.locations = [
- (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
+ virtualHosts.default = {
+ serverAliases = [
+ "localhost"
+ "${config.krebs.build.host.name}"
+ "${config.krebs.build.host.name}.r"
+ "${config.krebs.build.host.name}.retiolum"
+ ];
+ locations."~ ^/~(.+?)(/.*)?\$".extraConfig = ''
alias /home/$1/public_html$2;
- '')
- ];
+ '';
+ };
};
tv.iptables.input-internet-accept-tcp = singleton "http";
}