Merge remote-tracking branch 'pnp/master'

This commit is contained in:
tv 2015-07-29 15:21:15 +02:00
commit 9eb2d720e1
7 changed files with 38 additions and 15 deletions

View File

@ -1,4 +0,0 @@
deploy_host := root@pnp
nixpkgs_url := https://github.com/nixos/nixpkgs
nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
secrets_dir := /home/makefu/secrets/pnp

View File

@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtDhAxjiCH0SmTGNDqmlKPug9qTf+IFOVjdXfk01lAV2KMVW00CgNo2d5kl5+6pM99K7zZO7Uo7pmSFLSCAg8J6cMRI3v5OxFsnQfcJ9TeGLZt/ua7F8YsyIIr5wtqKtFbujqve31q9xJMypEpiX4np3nLiHfYwcWu7AFAUY8UHcCNl4JXm6hsmPe+9f6Mg2jICOdkfMMn0LtW+iq1KZpw1Nka2YUSiE2YuUtV+V+YaVMzdcjknkVkZNqcVk6tbJ1ZyZKM+bFEnE4VkHJYDABZfELpcgBAszfWrVG0QpEFjVCUq5atpIVHJcWWDx072r0zgdTPcBuzsHHC5PRfVBLEw== makefu@servarch

View File

@ -8,10 +8,25 @@
imports =
[ # Include the results of the hardware scan.
<nixpkgs/nixos/modules/profiles/qemu-guest.nix>
../../2configs/makefu/base.nix
../../2configs/makefu/cgit-retiolum.nix
../2configs/base.nix
../2configs/cgit-retiolum.nix
];
krebs.build.host = config.krebs.hosts.pnp;
krebs.build.user = config.krebs.users.makefu;
krebs.build.target = "root@pnp";
krebs.build.deps = {
nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
};
secrets = {
url = "/home/makefu/secrets/${config.krebs.build.host.name}";
};
stockholm = {
url = toString ../..;
};
};
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;

0
makefu/1systems/repunit Normal file
View File

View File

@ -39,6 +39,7 @@ with lib;
'';
environment.systemPackages = with pkgs; [
jq
git
vim
gnumake

View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
# TODO: remove tv lib :)
with import ../../4lib/tv { inherit lib pkgs; };
with import ../../tv/4lib { inherit lib pkgs; };
let
repos = priv-repos // krebs-repos ;
@ -30,12 +30,13 @@ let
post-receive = git.irc-announce {
nick = config.networking.hostName;
channel = "#retiolum";
# TODO remove the hardcoded hostname
server = "cd.retiolum";
};
};
};
set-owners = with git; repo: user:
set-owners = with git;repo: user:
singleton {
inherit user;
repo = [ repo ];
@ -52,17 +53,26 @@ let
# TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv uriel ];
priv-rules = with config.krebs.users; repo:
set-owners repo [ makefu ];
#all-makefu = with config.krebs.users; [ makefu ];
krebs-rules = with config.krebs.users; repo:
set-owners repo [ makefu ] ++ set-ro-access repo krebsminister ;
all-makefu = with config.krebs.users; [ makefu makefu-omo ];
priv-rules = repo: set-owners repo all-makefu;
krebs-rules = repo:
set-owners repo all-makefu ++ set-ro-access repo krebsminister;
in {
imports = [ ../../3modules/krebs/git.nix ];
imports = [{
krebs.users.makefu-omo = {
name = "makefu-omo" ;
pubkey= with builtins; readFile ../../Zpubkeys/makefu_omo.ssh.pub;
};
}];
krebs.git = {
enable = true;
root-title = "public repositories ";
root-title = "public repositories";
root-desc = "keep on krebsing";
inherit repos rules;
};

View File

@ -1,6 +1,6 @@
{ config, lib, ... }:
with import ../../4lib/krebs { inherit lib; };
with import ../../krebs/4lib { inherit lib; };
let
cfg = config.krebs;