summaryrefslogtreecommitdiffstats
path: root/1systems
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-24 11:50:23 +0200
committertv <tv@shackspace.de>2015-07-24 11:51:06 +0200
commit734ec4ae00c93d48297b7c3ee226ef890187bfa3 (patch)
treed0506e38317e9be22fcfd7ef283602e70b343bb6 /1systems
parent7846e26f8660b58d67eb90a21e7249715f49ac89 (diff)
3 {tv -> krebs}.nginx
Diffstat (limited to '1systems')
-rw-r--r--1systems/tv/cd.nix10
-rw-r--r--1systems/tv/nomic.nix4
-rw-r--r--1systems/tv/wu.nix4
3 files changed, 9 insertions, 9 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index d3cae6f4a..407fc25cf 100644
--- a/1systems/tv/cd.nix
+++ b/1systems/tv/cd.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 "/" ''
diff --git a/1systems/tv/nomic.nix b/1systems/tv/nomic.nix
index 6f984c44d..8e6812e43 100644
--- a/1systems/tv/nomic.nix
+++ b/1systems/tv/nomic.nix
@@ -26,8 +26,8 @@ with lib;
};
}
{
- imports = [ ../../3modules/tv/nginx.nix ];
- tv.nginx = {
+ imports = [ ../../3modules/krebs/nginx.nix ];
+ krebs.nginx = {
enable = true;
servers.default.locations = [
(nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
diff --git a/1systems/tv/wu.nix b/1systems/tv/wu.nix
index 76bb43eca..7a12bc571 100644
--- a/1systems/tv/wu.nix
+++ b/1systems/tv/wu.nix
@@ -134,8 +134,8 @@ in
};
}
{
- imports = [ ../../3modules/tv/nginx.nix ];
- tv.nginx = {
+ imports = [ ../../3modules/krebs/nginx.nix ];
+ krebs.nginx = {
enable = true;
servers.default.locations = [
(nameValuePair "~ ^/~(.+?)(/.*)?\$" ''