diff options
author | makefu <github@syntax-fehler.de> | 2015-07-24 13:28:35 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-07-24 13:28:35 +0200 |
commit | 03855bbd707cf7ca3e891f9193d55cb031c9ba4b (patch) | |
tree | 39ada4548a0aecb8ef85344f2d86bafd7b9bede1 /1systems/tv/cd.nix | |
parent | 8c92c4d7291ecbb66f2254e01e2c1f42722e11bb (diff) | |
parent | 50162983e041012abbddbb562bb655498f47c354 (diff) |
Merge branch 'master' of http://cgit.cd/stockholm
Diffstat (limited to '1systems/tv/cd.nix')
-rw-r--r-- | 1systems/tv/cd.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix index d3cae6f..463d643 100644 --- a/1systems/tv/cd.nix +++ b/1systems/tv/cd.nix @@ -29,10 +29,10 @@ in }; } { - imports = [ ../../3modules/tv/github-hosts-sync.nix ]; - tv.github-hosts-sync.enable = true; + imports = [ ../../3modules/krebs/github-hosts-sync.nix ]; + krebs.github-hosts-sync.enable = true; tv.iptables.input-internet-accept-new-tcp = - singleton config.tv.github-hosts-sync.port; + singleton config.krebs.github-hosts-sync.port; } { imports = [ ../../2configs/tv/identity.nix ]; @@ -57,19 +57,19 @@ in { imports = [ ../../3modules/tv/iptables.nix - ../../3modules/tv/nginx.nix + ../../3modules/krebs/nginx.nix ]; tv.iptables.input-internet-accept-new-tcp = singleton "http"; - tv.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de"; + krebs.nginx.servers.cgit.server-names = singleton "cgit.cd.viljetic.de"; } { # TODO make public_html also available to cd, cd.retiolum (AKA default) imports = [ ../../3modules/tv/iptables.nix - ../../3modules/tv/nginx.nix + ../../3modules/krebs/nginx.nix ]; tv.iptables.input-internet-accept-new-tcp = singleton "http"; - tv.nginx.servers.public_html = { + krebs.nginx.servers.public_html = { server-names = singleton "cd.viljetic.de"; locations = singleton (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' alias /home/$1/public_html$2; @@ -77,7 +77,7 @@ in }; } { - tv.nginx.servers.viljetic = { + krebs.nginx.servers.viljetic = { server-names = singleton "viljetic.de"; # TODO directly set root (instead via location) locations = singleton (nameValuePair "/" '' |