summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-06-19 21:40:00 +0200
committertv <tv@shackspace.de>2015-06-19 21:40:00 +0200
commit4b5ce294aa84de4143ab290f25e08ee2007caace (patch)
tree6cfcb6c5ac4d661732e3110c821f7de795879f13
parent71d04007a870e0ed8bd80cdffa93bed5bb80f95b (diff)
cd/git.nix -> tv/git/public.nix
-rw-r--r--modules/cd/default.nix2
-rw-r--r--modules/tv/git/public.nix (renamed from modules/cd/git.nix)10
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index ca798f8e6..bdd6ccecb 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -8,7 +8,6 @@ in
imports =
[
<secrets/hashedPasswords.nix>
- ./git.nix
./iptables.nix
./networking.nix
../common/nixpkgs.nix
@@ -16,6 +15,7 @@ in
../tv/base-cac-CentOS-7-64bit.nix
../tv/ejabberd.nix # XXX echtes modul
../tv/exim-smarthost.nix
+ ../tv/git/public.nix
../tv/retiolum.nix
../tv/sanitize.nix
];
diff --git a/modules/cd/git.nix b/modules/tv/git/public.nix
index 42b0bc12e..7dc93e821 100644
--- a/modules/cd/git.nix
+++ b/modules/tv/git/public.nix
@@ -4,9 +4,9 @@ let
inherit (builtins) map readFile;
inherit (lib) concatMap listToAttrs;
# TODO lib should already include our stuff
- inherit (import ../../lib { inherit lib pkgs; }) addNames git;
+ inherit (import ../../../lib { inherit lib pkgs; }) addNames git;
- cd-repos = [
+ public-git-repos = [
(public "cgserver")
(public "crude-mail-setup")
(public "dot-xmonad")
@@ -30,9 +30,9 @@ let
makefu = { pubkey = "xxx"; };
};
- repos = listToAttrs (map ({ repo, ... }: { name = repo.name; value = repo; }) cd-repos);
+ repos = listToAttrs (map ({ repo, ... }: { name = repo.name; value = repo; }) public-git-repos);
- rules = concatMap ({ rules, ... }: rules) cd-repos;
+ rules = concatMap ({ rules, ... }: rules) public-git-repos;
public = repo-name:
rec {
@@ -63,7 +63,7 @@ in
{
imports = [
- ../tv/git
+ ./.
];
services.git = {