summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-02-04 14:35:29 +0100
committermakefu <github@syntax-fehler.de>2017-02-04 14:35:29 +0100
commit8eb9faea91abe315207289235fbaa612946ff63e (patch)
tree5943adb228ae3b1d6e59f06dc4f36e19afc87c38 /makefu/2configs
parentd6c9edd9dc860d560d4ea7a727962aaf93d09322 (diff)
Apply stashed changes
sorry
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix4
-rw-r--r--makefu/2configs/git/cgit-retiolum.nix3
2 files changed, 4 insertions, 3 deletions
diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 9e3f3eb61..95ca4884e 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -22,11 +22,11 @@ with import <stockholm/lib>;
user = config.krebs.users.makefu;
source = let
inherit (config.krebs.build) host user;
- ref = "ee13b9af"; # stable @ 2016-12-12
+ ref = "5dad589"; # stable @ 2016-12-28 + cherry-pick graphite
in {
nixpkgs = if config.makefu.full-populate || (getEnv "dummy_secrets" == "true") then
{
- git = { url = https://github.com/nixos/nixpkgs; inherit ref; };
+ git = { url = https://github.com/makefu/nixpkgs; inherit ref; };
}
else
# TODO use http, once it is implemented
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix
index 553a23972..81a5cde81 100644
--- a/makefu/2configs/git/cgit-retiolum.nix
+++ b/makefu/2configs/git/cgit-retiolum.nix
@@ -26,6 +26,7 @@ let
priv-repos = mapAttrs make-priv-repo {
autosync = { };
+ pass = { };
};
connector-repos = mapAttrs make-priv-repo {
@@ -61,7 +62,7 @@ let
# TODO: get the list of all krebsministers
krebsminister = with config.krebs.users; [ lass tv ];
- all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp makefu-vbob ];
+ all-makefu = with config.krebs.users; [ makefu makefu-omo makefu-tsp makefu-vbob makefu-tempx ];
all-exco = with config.krebs.users; [ exco ];
priv-rules = repo: set-owners repo all-makefu;