From 0b00e7e70eefd3b22b65a29506003bd984dfb6f2 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 28 Jul 2015 20:19:54 +0200 Subject: [PATCH 1/6] makefu:rename to user-toplevel structure --- {1systems/makefu => makefu/1systems}/pnp.nix | 0 {2configs/makefu => makefu/2configs}/base.nix | 0 {2configs/makefu => makefu/2configs}/cgit-retiolum.nix | 0 {3modules/makefu => makefu/3modules}/default.nix | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {1systems/makefu => makefu/1systems}/pnp.nix (100%) rename {2configs/makefu => makefu/2configs}/base.nix (100%) rename {2configs/makefu => makefu/2configs}/cgit-retiolum.nix (100%) rename {3modules/makefu => makefu/3modules}/default.nix (100%) diff --git a/1systems/makefu/pnp.nix b/makefu/1systems/pnp.nix similarity index 100% rename from 1systems/makefu/pnp.nix rename to makefu/1systems/pnp.nix diff --git a/2configs/makefu/base.nix b/makefu/2configs/base.nix similarity index 100% rename from 2configs/makefu/base.nix rename to makefu/2configs/base.nix diff --git a/2configs/makefu/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix similarity index 100% rename from 2configs/makefu/cgit-retiolum.nix rename to makefu/2configs/cgit-retiolum.nix diff --git a/3modules/makefu/default.nix b/makefu/3modules/default.nix similarity index 100% rename from 3modules/makefu/default.nix rename to makefu/3modules/default.nix From a8724063ff3651aaf129acd498b2afdcdecb4ca2 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 28 Jul 2015 20:27:12 +0200 Subject: [PATCH 2/6] makefu/0make: mv pnp --- {0make/makefu => makefu/0make}/pnp.makefile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {0make/makefu => makefu/0make}/pnp.makefile (100%) diff --git a/0make/makefu/pnp.makefile b/makefu/0make/pnp.makefile similarity index 100% rename from 0make/makefu/pnp.makefile rename to makefu/0make/pnp.makefile From 9575e56d6980cd9770befce5605eabd290ca5dbb Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 Jul 2015 01:07:41 +0200 Subject: [PATCH 3/6] update paths in makefu cfg --- makefu/1systems/pnp.nix | 4 ++-- makefu/2configs/base.nix | 1 + makefu/2configs/cgit-retiolum.nix | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 1019c4d70..e28c82938 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -8,8 +8,8 @@ imports = [ # Include the results of the hardware scan. - ../../2configs/makefu/base.nix - ../../2configs/makefu/cgit-retiolum.nix + ../2configs/base.nix + ../2configs/cgit-retiolum.nix ]; krebs.build.host = config.krebs.hosts.pnp; diff --git a/makefu/2configs/base.nix b/makefu/2configs/base.nix index b052b13e4..8dfb2ef27 100644 --- a/makefu/2configs/base.nix +++ b/makefu/2configs/base.nix @@ -39,6 +39,7 @@ with lib; ''; environment.systemPackages = with pkgs; [ + jq git vim gnumake diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix index 7b8e3bc97..e10769335 100644 --- a/makefu/2configs/cgit-retiolum.nix +++ b/makefu/2configs/cgit-retiolum.nix @@ -1,10 +1,10 @@ { config, lib, pkgs, ... }: # TODO: remove tv lib :) -with import ../../4lib/tv { inherit lib pkgs; }; +with import ../../tv/4lib/{ inherit lib pkgs; }; let out = { - imports = [ ../../3modules/krebs/git.nix ]; + imports = [ ]; krebs.git = { enable = true; root-title = "public repositories "; From 671710c573980d859cb82993cd0514058a63262f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 Jul 2015 14:22:24 +0200 Subject: [PATCH 4/6] makefu: add new git user makefu-omo --- Zpubkeys/makefu_omo.ssh.pub | 1 + makefu/0make/pnp.makefile | 4 ---- makefu/2configs/cgit-retiolum.nix | 24 +++++++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 Zpubkeys/makefu_omo.ssh.pub delete mode 100644 makefu/0make/pnp.makefile diff --git a/Zpubkeys/makefu_omo.ssh.pub b/Zpubkeys/makefu_omo.ssh.pub new file mode 100644 index 000000000..5567040fb --- /dev/null +++ b/Zpubkeys/makefu_omo.ssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtDhAxjiCH0SmTGNDqmlKPug9qTf+IFOVjdXfk01lAV2KMVW00CgNo2d5kl5+6pM99K7zZO7Uo7pmSFLSCAg8J6cMRI3v5OxFsnQfcJ9TeGLZt/ua7F8YsyIIr5wtqKtFbujqve31q9xJMypEpiX4np3nLiHfYwcWu7AFAUY8UHcCNl4JXm6hsmPe+9f6Mg2jICOdkfMMn0LtW+iq1KZpw1Nka2YUSiE2YuUtV+V+YaVMzdcjknkVkZNqcVk6tbJ1ZyZKM+bFEnE4VkHJYDABZfELpcgBAszfWrVG0QpEFjVCUq5atpIVHJcWWDx072r0zgdTPcBuzsHHC5PRfVBLEw== makefu@servarch diff --git a/makefu/0make/pnp.makefile b/makefu/0make/pnp.makefile deleted file mode 100644 index a18efe0e0..000000000 --- a/makefu/0make/pnp.makefile +++ /dev/null @@ -1,4 +0,0 @@ -deploy_host := root@pnp -nixpkgs_url := https://github.com/nixos/nixpkgs -nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870 -secrets_dir := /home/makefu/secrets/pnp diff --git a/makefu/2configs/cgit-retiolum.nix b/makefu/2configs/cgit-retiolum.nix index 777c16cfb..7dfb181c5 100644 --- a/makefu/2configs/cgit-retiolum.nix +++ b/makefu/2configs/cgit-retiolum.nix @@ -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; }; From fe188078f3ee9536bb0eb5a63058346c75c8ab53 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 Jul 2015 14:57:25 +0200 Subject: [PATCH 5/6] update path to new krebs lib --- makefu/3modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/3modules/default.nix b/makefu/3modules/default.nix index 45ca8c3eb..015f472f7 100644 --- a/makefu/3modules/default.nix +++ b/makefu/3modules/default.nix @@ -1,6 +1,6 @@ { config, lib, ... }: -with import ../../4lib/krebs { inherit lib; }; +with import ../../krebs/4lib { inherit lib; }; let cfg = config.krebs; From e5b8e2e4a4e15f587586d308b159d657bf0ede9c Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 29 Jul 2015 15:14:52 +0200 Subject: [PATCH 6/6] init: repunit --- makefu/1systems/repunit | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 makefu/1systems/repunit diff --git a/makefu/1systems/repunit b/makefu/1systems/repunit new file mode 100644 index 000000000..e69de29bb