Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

3 {tv -> krebs}.nginx

Browse Source
This commit is contained in:
tv 2015-07-24 11:50:23 +02:00
parent 7846e26f86
commit 734ec4ae00
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
1systems/tv/cd.nix
View File

@ -57,19 +57,19 @@ in
{ {
imports = [ imports = [
../../3modules/tv/iptables.nix ../../3modules/tv/iptables.nix
../../3modules/tv/nginx.nix ../../3modules/krebs/nginx.nix
]; ];
tv.iptables.input-internet-accept-new-tcp = singleton "http"; 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) # TODO make public_html also available to cd, cd.retiolum (AKA default)
imports = [ imports = [
../../3modules/tv/iptables.nix ../../3modules/tv/iptables.nix
../../3modules/tv/nginx.nix ../../3modules/krebs/nginx.nix
]; ];
tv.iptables.input-internet-accept-new-tcp = singleton "http"; 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"; server-names = singleton "cd.viljetic.de";
locations = singleton (nameValuePair "~ ^/~(.+?)(/.*)?\$" '' locations = singleton (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''
alias /home/$1/public_html$2; alias /home/$1/public_html$2;
@ -77,7 +77,7 @@ in
}; };
} }
{ {
tv.nginx.servers.viljetic = { krebs.nginx.servers.viljetic = {
server-names = singleton "viljetic.de"; server-names = singleton "viljetic.de";
# TODO directly set root (instead via location) # TODO directly set root (instead via location)
locations = singleton (nameValuePair "/" '' locations = singleton (nameValuePair "/" ''

4
1systems/tv/nomic.nix
View File

@ -26,8 +26,8 @@ with lib;
}; };
} }
{ {
imports = [ ../../3modules/tv/nginx.nix ]; imports = [ ../../3modules/krebs/nginx.nix ];
tv.nginx = { krebs.nginx = {
enable = true; enable = true;
servers.default.locations = [ servers.default.locations = [
(nameValuePair "~ ^/~(.+?)(/.*)?\$" '' (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''

4
1systems/tv/wu.nix
View File

@ -134,8 +134,8 @@ in
}; };
} }
{ {
imports = [ ../../3modules/tv/nginx.nix ]; imports = [ ../../3modules/krebs/nginx.nix ];
tv.nginx = { krebs.nginx = {
enable = true; enable = true;
servers.default.locations = [ servers.default.locations = [
(nameValuePair "~ ^/~(.+?)(/.*)?\$" '' (nameValuePair "~ ^/~(.+?)(/.*)?\$" ''

7
3modules/tv/nginx.nix → 3modules/krebs/nginx.nix
View File

@ -3,21 +3,22 @@
with builtins; with builtins;
with lib; with lib;
let let
cfg = config.tv.nginx; cfg = config.krebs.nginx;
out = { out = {
options.tv.nginx = api; options.krebs.nginx = api;
config = mkIf cfg.enable imp; config = mkIf cfg.enable imp;
}; };
api = { api = {
enable = mkEnableOption "tv.nginx"; enable = mkEnableOption "krebs.nginx";
servers = mkOption { servers = mkOption {
type = with types; attrsOf optionSet; type = with types; attrsOf optionSet;
options = singleton { options = singleton {
server-names = mkOption { server-names = mkOption {
type = with types; listOf str; type = with types; listOf str;
# TODO use identity
default = [ default = [
"${config.networking.hostName}" "${config.networking.hostName}"
"${config.networking.hostName}.retiolum" "${config.networking.hostName}.retiolum"

5
3modules/tv/git.nix
View File

@ -12,8 +12,9 @@ let
cfg = config.tv.git; cfg = config.tv.git;
out = { out = {
# TODO don't import krebs.nginx here
imports = [ imports = [
../../3modules/tv/nginx.nix ../../3modules/krebs/nginx.nix
]; ];
options.tv.git = api; options.tv.git = api;
config = mkIf cfg.enable (mkMerge [ config = mkIf cfg.enable (mkMerge [
@ -210,7 +211,7 @@ let
chown ${toString fcgitwrap-user.uid}:${toString fcgitwrap-group.gid} /tmp/cgit chown ${toString fcgitwrap-user.uid}:${toString fcgitwrap-group.gid} /tmp/cgit
''; '';
tv.nginx = { krebs.nginx = {
enable = true; enable = true;
servers.cgit = { servers.cgit = {
server-names = [ server-names = [