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

cd/git.nix -> tv/git/public.nix

Browse Source
This commit is contained in:
tv 2015-06-19 21:40:00 +02:00
parent 71d04007a8
commit 4b5ce294aa
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cd/default.nix
View File

@ -8,7 +8,6 @@ in
imports = imports =
[ [
<secrets/hashedPasswords.nix> <secrets/hashedPasswords.nix>
./git.nix
./iptables.nix ./iptables.nix
./networking.nix ./networking.nix
../common/nixpkgs.nix ../common/nixpkgs.nix
@ -16,6 +15,7 @@ in
../tv/base-cac-CentOS-7-64bit.nix ../tv/base-cac-CentOS-7-64bit.nix
../tv/ejabberd.nix # XXX echtes modul ../tv/ejabberd.nix # XXX echtes modul
../tv/exim-smarthost.nix ../tv/exim-smarthost.nix
../tv/git/public.nix
../tv/retiolum.nix ../tv/retiolum.nix
../tv/sanitize.nix ../tv/sanitize.nix
]; ];

10
modules/cd/git.nix → modules/tv/git/public.nix
View File

@ -4,9 +4,9 @@ let
inherit (builtins) map readFile; inherit (builtins) map readFile;
inherit (lib) concatMap listToAttrs; inherit (lib) concatMap listToAttrs;
# TODO lib should already include our stuff # 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 "cgserver")
(public "crude-mail-setup") (public "crude-mail-setup")
(public "dot-xmonad") (public "dot-xmonad")
@ -30,9 +30,9 @@ let
makefu = { pubkey = "xxx"; }; 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: public = repo-name:
rec { rec {
@ -63,7 +63,7 @@ in
{ {
imports = [ imports = [
../tv/git ./.
]; ];
services.git = { services.git = {