diff options
| author | tv <tv@shackspace.de> | 2015-07-24 11:50:23 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-07-24 11:51:06 +0200 |
| commit | 734ec4ae00c93d48297b7c3ee226ef890187bfa3 (patch) | |
| tree | d0506e38317e9be22fcfd7ef283602e70b343bb6 /3modules | |
| parent | 7846e26f8660b58d67eb90a21e7249715f49ac89 (diff) | |
3 {tv -> krebs}.nginx
Diffstat (limited to '3modules')
| -rw-r--r-- | 3modules/krebs/nginx.nix (renamed from 3modules/tv/nginx.nix) | 7 | ||||
| -rw-r--r-- | 3modules/tv/git.nix | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/3modules/tv/nginx.nix b/3modules/krebs/nginx.nix index a58c49520..702e8a7f6 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 8c73d0354..ea014e2a7 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 = [ |