summaryrefslogtreecommitdiffstats
path: root/krebs/3modules/default.nix
diff options
context:
space:
mode:
authormiefda <miefda@miefda.de>2015-12-30 18:24:44 +0100
committermiefda <miefda@miefda.de>2015-12-30 18:24:44 +0100
commitc562e447ba927ea20bf7d2dfff9a4f4807ee4463 (patch)
tree57f5496e7acbc9dfeec7f406a6857687219625d0 /krebs/3modules/default.nix
parentb96fd072e1ac5e5b6b5b3e92c678dc4bb4cb7e1f (diff)
parent9b890750e24f43182ebf1732871a60d9e0c74c89 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'krebs/3modules/default.nix')
-rw-r--r--krebs/3modules/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index dddb2df50..65c1aa2ec 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -7,8 +7,11 @@ let
out = {
imports = [
./apt-cacher-ng.nix
+ ./backup.nix
./bepasty-server.nix
./build.nix
+ ./buildbot/master.nix
+ ./buildbot/slave.nix
./current.nix
./exim-retiolum.nix
./exim-smarthost.nix