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

host cd: move git config to separate file

Browse Source
This commit is contained in:
tv 2015-06-18 23:59:14 +02:00
parent 313fe868aa
commit ca7048e27c
2 changed files with 61 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modules/cd/default.nix
View File

@ -1,9 +1,10 @@
{ config, lib, pkgs, ... }:
{ pkgs, ... }:
{
imports =
[
<secrets/hashedPasswords.nix>
./git.nix
./iptables.nix
./networking.nix
../common/nixpkgs.nix
@ -11,7 +12,6 @@
../tv/base-cac-CentOS-7-64bit.nix
../tv/ejabberd.nix # XXX echtes modul
../tv/exim-smarthost.nix
../tv/git
../tv/retiolum.nix
../tv/sanitize.nix
];
@ -44,58 +44,6 @@
enable = true;
};
services.git =
let
inherit (builtins) readFile;
# TODO lib should already include our stuff
inherit (import ../../lib { inherit lib pkgs; }) addNames git;
in
rec {
enable = true;
users = addNames {
tv = { pubkey = readFile <pubkeys/tv.ssh.pub>; };
lass = { pubkey = "xxx"; };
makefu = { pubkey = "xxx"; };
};
repos = addNames {
shitment = {
desc = "shitment repository";
hooks = {
post-receive = git.irc-announce {
nick = config.networking.hostName; # TODO make this the default
channel = "#retiolum";
server = "ire.retiolum";
};
};
public = true;
};
testing = {
desc = "testing repository";
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; with repos; [
{ user = tv;
repo = [ testing shitment ];
perm = push "refs/*" [ non-fast-forward create delete merge ];
}
{ user = [ lass makefu ];
repo = [ testing shitment ];
perm = fetch;
}
];
};
services.journald.extraConfig = ''
SystemMaxUse=1G
RuntimeMaxUse=128M

59
modules/cd/git.nix Normal file
View File

@ -0,0 +1,59 @@
{ config, lib, pkgs, ... }:
let
inherit (builtins) readFile;
# TODO lib should already include our stuff
inherit (import ../../lib { inherit lib pkgs; }) addNames git;
in
{
imports = [
../tv/git
];
services.git = rec {
enable = true;
users = addNames {
tv = { pubkey = readFile <pubkeys/tv.ssh.pub>; };
lass = { pubkey = "xxx"; };
makefu = { pubkey = "xxx"; };
};
repos = addNames {
shitment = {
desc = "shitment repository";
hooks = {
post-receive = git.irc-announce {
nick = config.networking.hostName; # TODO make this the default
channel = "#retiolum";
server = "ire.retiolum";
};
};
public = true;
};
testing = {
desc = "testing repository";
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; with repos; [
{ user = tv;
repo = [ testing shitment ];
perm = push "refs/*" [ non-fast-forward create delete merge ];
}
{ user = [ lass makefu ];
repo = [ testing shitment ];
perm = fetch;
}
];
};
}