summaryrefslogtreecommitdiffstats
path: root/modules/cd
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 /modules/cd
parent71d04007a870e0ed8bd80cdffa93bed5bb80f95b (diff)
cd/git.nix -> tv/git/public.nix
Diffstat (limited to 'modules/cd')
-rw-r--r--modules/cd/default.nix2
-rw-r--r--modules/cd/git.nix73
2 files changed, 1 insertions, 74 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/cd/git.nix
deleted file mode 100644
index 42b0bc12e..000000000
--- a/modules/cd/git.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
- inherit (builtins) map readFile;
- inherit (lib) concatMap listToAttrs;
- # TODO lib should already include our stuff
- inherit (import ../../lib { inherit lib pkgs; }) addNames git;
-
- cd-repos = [
- (public "cgserver")
- (public "crude-mail-setup")
- (public "dot-xmonad")
- (public "hack")
- (public "load-env")
- (public "make-snapshot")
- (public "mime")
- (public "much")
- (public "nixos-infest")
- (public "painload")
- (public "regfish")
- (public "shitment")
- (public "wai-middleware-time")
- (public "web-routes-wai-custom")
- ];
-
- users = addNames {
- tv = { pubkey = readFile <pubkeys/tv_wu.ssh.pub>; };
- lass = { pubkey = readFile <pubkeys/lass.ssh.pub>; };
- uriel = { pubkey = readFile <pubkeys/uriel.ssh.pub>; };
- makefu = { pubkey = "xxx"; };
- };
-
- repos = listToAttrs (map ({ repo, ... }: { name = repo.name; value = repo; }) cd-repos);
-
- rules = concatMap ({ rules, ... }: rules) cd-repos;
-
- public = repo-name:
- rec {
- repo = {
- name = repo-name;
- hooks = {
- post-receive = git.irc-announce {
- nick = config.networking.hostName; # TODO make this the default
- channel = "#retiolum";
- server = "ire.retiolum";
- };
- };
- public = true;
- };
- rules = with git; with users; [
- { user = tv;
- repo = [ repo ];
- perm = push "refs/*" [ non-fast-forward create delete merge ];
- }
- { user = [ lass makefu uriel ];
- repo = [ repo ];
- perm = fetch;
- }
- ];
- };
-
-in
-
-{
- imports = [
- ../tv/git
- ];
-
- services.git = {
- enable = true;
- inherit repos rules users;
- };
-}