summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2015-07-24 11:50:23 +0200
committertv <tv@krebsco.de>2015-07-24 11:51:06 +0200
commit6a0dc8e6d766fe4e970e7b360fbb2bbe79421853 (patch)
treed0506e38317e9be22fcfd7ef283602e70b343bb6
parentadaaba6ab8f4d403d1da39288e98740a5acfee95 (diff)
3 {tv -> krebs}.nginx
-rw-r--r--1systems/tv/cd.nix10
-rw-r--r--1systems/tv/nomic.nix4
-rw-r--r--1systems/tv/wu.nix4
-rw-r--r--3modules/krebs/nginx.nix (renamed from 3modules/tv/nginx.nix)7
-rw-r--r--3modules/tv/git.nix5
5 files changed, 16 insertions, 14 deletions
diff --git a/1systems/tv/cd.nix b/1systems/tv/cd.nix
index d3cae6f..407fc25 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 6f984c4..8e6812e 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 76bb43e..7a12bc5 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 "~ ^/~(.+?)(/.*)?\$" ''
diff --git a/3modules/tv/nginx.nix b/3modules/krebs/nginx.nix
index a58c495..702e8a7 100644
--- a/3modules/tv/nginx.nix
+++ b/3modules/krebs/nginx.nix
@@ -3,21 +3,22 @@
with builtins;
with lib;
let
- cfg = config.tv.nginx;
+ cfg = config.krebs.nginx;
out = {
- options.tv.nginx = api;
+ options.krebs.nginx = api;
config = mkIf cfg.enable imp;
};
api = {
- enable = mkEnableOption "tv.nginx";
+ enable = mkEnableOption "krebs.nginx";
servers = mkOption {
type = with types; attrsOf optionSet;
options = singleton {
server-names = mkOption {
type = with types; listOf str;
+ # TODO use identity
default = [
"${config.networking.hostName}"
"${config.networking.hostName}.retiolum"
diff --git a/3modules/tv/git.nix b/3modules/tv/git.nix
index 8c73d03..ea014e2 100644
--- a/3modules/tv/git.nix
+++ b/3modules/tv/git.nix
@@ -12,8 +12,9 @@ let
cfg = config.tv.git;
out = {
+ # TODO don't import krebs.nginx here
imports = [
- ../../3modules/tv/nginx.nix
+ ../../3modules/krebs/nginx.nix
];
options.tv.git = api;
config = mkIf cfg.enable (mkMerge [
@@ -210,7 +211,7 @@ let
chown ${toString fcgitwrap-user.uid}:${toString fcgitwrap-group.gid} /tmp/cgit
'';
- tv.nginx = {
+ krebs.nginx = {
enable = true;
servers.cgit = {
server-names = [