summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-24 11:44:49 +0200
committertv <tv@shackspace.de>2015-07-24 11:51:06 +0200
commit5f63c4071c7b1680e75671c0acede8a9bce4b14c (patch)
tree09235e4342792bba5adf0c52950514ed5e339c81
parent734ec4ae00c93d48297b7c3ee226ef890187bfa3 (diff)
3: {tv -> krebs}.git
-rw-r--r--2configs/tv/git-public.nix4
-rw-r--r--3modules/krebs/git.nix (renamed from 3modules/tv/git.nix)6
2 files changed, 5 insertions, 5 deletions
diff --git a/2configs/tv/git-public.nix b/2configs/tv/git-public.nix
index 7222f99eb..7f2b51308 100644
--- a/2configs/tv/git-public.nix
+++ b/2configs/tv/git-public.nix
@@ -3,8 +3,8 @@ with import ../../4lib/tv { inherit lib pkgs; };
let
out = {
- imports = [ ../../3modules/tv/git.nix ];
- tv.git = {
+ imports = [ ../../3modules/krebs/git.nix ];
+ krebs.git = {
enable = true;
root-title = "public repositories at ${config.tv.identity.self.name}";
root-desc = "keep calm and engage";
diff --git a/3modules/tv/git.nix b/3modules/krebs/git.nix
index ea014e2a7..3c3e93426 100644
--- a/3modules/tv/git.nix
+++ b/3modules/krebs/git.nix
@@ -9,14 +9,14 @@
with builtins;
with lib;
let
- cfg = config.tv.git;
+ cfg = config.krebs.git;
out = {
# TODO don't import krebs.nginx here
imports = [
../../3modules/krebs/nginx.nix
];
- options.tv.git = api;
+ options.krebs.git = api;
config = mkIf cfg.enable (mkMerge [
(mkIf cfg.cgit cgit-imp)
git-imp
@@ -24,7 +24,7 @@ let
};
api = {
- enable = mkEnableOption "tv.git";
+ enable = mkEnableOption "krebs.git";
cgit = mkOption {
type = types.bool;