summaryrefslogtreecommitdiffstats
path: root/krebs/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-17 01:14:03 +0200
committermakefu <github@syntax-fehler.de>2018-09-17 01:14:03 +0200
commit12a3936e06b3fc6cb3b61fd10c7aeb8d3f461f63 (patch)
tree7ad0d614aa4290878a1c265e22a4c6f3d964de73 /krebs/2configs
parent0823d0cbdc2861defaabc232058d96c8862c0b24 (diff)
parentfca8903d5bea7be12f3f1f46b3cd2f5b9803e30c (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/2configs')
-rw-r--r--krebs/2configs/buildbot-stockholm.nix12
-rw-r--r--krebs/2configs/reaktor-krebs.nix6
2 files changed, 18 insertions, 0 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 0ee91ae3..d10fb720 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -16,6 +16,18 @@
krebs.ci = {
enable = true;
repos = {
+ disko.urls = [
+ "http://cgit.gum.r/disko"
+ "http://cgit.hotdog.r/disko"
+ "http://cgit.ni.r/disko"
+ "http://cgit.prism.r/disko"
+ ];
+ nix_writers.urls = [
+ "http://cgit.hotdog.r/nix-writers"
+ "http://cgit.ni.r/nix-writers"
+ "http://cgit.prism.r/nix-writers"
+ "https://git.ingolf-wagner.de/krebs/nix-writers.git"
+ ];
stockholm.urls = [
"http://cgit.enklave.r/stockholm"
"http://cgit.gum.r/stockholm"
diff --git a/krebs/2configs/reaktor-krebs.nix b/krebs/2configs/reaktor-krebs.nix
index ba371516..dc2838ca 100644
--- a/krebs/2configs/reaktor-krebs.nix
+++ b/krebs/2configs/reaktor-krebs.nix
@@ -10,6 +10,7 @@ with import <stockholm/lib>;
];
extraEnviron = {
REAKTOR_HOST = "irc.freenode.org";
+ REAKTOR_NICKSERV_PASSWORD = "/var/lib/Reaktor/reaktor_nickserv_password";
};
plugins = with pkgs.ReaktorPlugins; [
sed-plugin
@@ -21,4 +22,9 @@ with import <stockholm/lib>;
(attrValues (todo "agenda"))
;
};
+ krebs.secret.files.nix-serve-key = {
+ path = "/var/lib/Reaktor/reaktor_nickserv_password";
+ owner.name = "Reaktor";
+ source-path = toString <secrets> + "/reaktor_nickserv_password";
+ };
}