makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

makefu: fix cgit for wry, add gc to wry

Browse source
This commit is contained in:
makefu 2015-11-17 22:16:55 +01:00
parent c15c7ac3ac
commit c692d8a5cb
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
1systems/wry.nix
View file

@ -24,11 +24,11 @@ in {
# other nginx # other nginx
../2configs/nginx/euer.wiki.nix ../2configs/nginx/euer.wiki.nix
../2configs/nginx/euer.blog.nix ../2configs/nginx/euer.blog.nix
../2configs/nginx/euer.test.nix
# collectd # collectd
../2configs/collectd/collectd-base.nix ../2configs/collectd/collectd-base.nix
]; ];
krebs.build.host = config.krebs.hosts.wry; krebs.build.host = config.krebs.hosts.wry;
krebs.Reaktor.enable = true; krebs.Reaktor.enable = true;
@ -73,5 +73,9 @@ in {
nameservers = [ "8.8.8.8" ]; nameservers = [ "8.8.8.8" ];
}; };
environment.systemPackages = [ pkgs.translate-shell ]; # small machine - do not forget to gc every day
nix.gc.automatic = true;
nix.gc.dates = "03:10";
environment.systemPackages = [ ];
} }

23
2configs/git/cgit-retiolum.nix
View file

@ -22,7 +22,7 @@ let
}; };
connector-repos = mapAttrs make-priv-repo { connector-repos = mapAttrs make-priv-repo {
autosync = { }; connector = { };
}; };
@ -36,7 +36,7 @@ let
inherit name desc; inherit name desc;
public = true; public = true;
hooks = { hooks = {
post-receive = git.irc-announce { post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName; nick = config.networking.hostName;
verbose = config.krebs.build.host.name == "pnp"; verbose = config.krebs.build.host.name == "pnp";
channel = "#retiolum"; channel = "#retiolum";
@ -51,11 +51,11 @@ let
# TODO: get the list of all krebsministers # TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv uriel ]; krebsminister = with config.krebs.users; [ lass tv uriel ];
all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp ]; all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp ];
exco = with config.krebs.users; [ exco ]; all-exco = with config.krebs.users; [ exco ];
priv-rules = repo: set-owners repo all-makefu; priv-rules = repo: set-owners repo all-makefu;
connector-rules = repo: set-owners repo (all-makefu ++ exco); connector-rules = repo: set-owners repo all-makefu ++ set-owners repo all-exco;
krebs-rules = repo: krebs-rules = repo:
set-owners repo all-makefu ++ set-ro-access repo krebsminister; set-owners repo all-makefu ++ set-ro-access repo krebsminister;
@ -76,18 +76,19 @@ let
in { in {
imports = [{ imports = [{
krebs.users.makefu-omo = { krebs.users = {
makefu-omo = {
name = "makefu-omo" ; name = "makefu-omo" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub; pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_omo.ssh.pub;
}; };
krebs.users.makefu-tsp = { makefu-tsp = {
name = "makefu-tsp" ; name = "makefu-tsp" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub; pubkey= with builtins; readFile ../../../krebs/Zpubkeys/makefu_tsp.ssh.pub;
}; };
exco = {
krebs.users.exco = { name = "exco";
name = "exco" ;
pubkey= with builtins; readFile ../../../krebs/Zpubkeys/exco.ssh.pub; pubkey= with builtins; readFile ../../../krebs/Zpubkeys/exco.ssh.pub;
};
}; };
}]; }];
krebs.git = { krebs.git = {