diff options
author | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2018-10-07 23:12:16 +0200 |
commit | 91023a11ebae6794caaecc882892da7f90deea28 (patch) | |
tree | 5bfd29cf49b1248cff80c4e001b0bf78b972ff26 /krebs/2configs | |
parent | 9104af869e8c8ce299fc2ddbf7f2631bbbf48b1e (diff) | |
parent | 6b08d5aa46adc80d8a1ab4ed1d3e320c61a19f01 (diff) |
Merge remote-tracking branch 'lass/18.09' into 18.09
Diffstat (limited to 'krebs/2configs')
-rw-r--r-- | krebs/2configs/buildbot-stockholm.nix | 6 | ||||
-rw-r--r-- | krebs/2configs/ircd.nix | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix index d10fb7203..5784f2cdc 100644 --- a/krebs/2configs/buildbot-stockholm.nix +++ b/krebs/2configs/buildbot-stockholm.nix @@ -22,6 +22,12 @@ "http://cgit.ni.r/disko" "http://cgit.prism.r/disko" ]; + krops.urls = [ + "http://cgit.hotdog.r/krops" + "http://cgit.ni.r/krops" + "http://cgit.prism.r/krops" + "https://git.ingolf-wagner.de/krebs/krops.git" + ]; nix_writers.urls = [ "http://cgit.hotdog.r/nix-writers" "http://cgit.ni.r/nix-writers" diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix index 962dbf49c..65972aacc 100644 --- a/krebs/2configs/ircd.nix +++ b/krebs/2configs/ircd.nix @@ -5,7 +5,7 @@ 6667 6669 ]; - services.charybdis = { + krebs.charybdis = { enable = true; motd = '' hello |