summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-10 19:01:43 +0100
committermakefu <github@syntax-fehler.de>2015-11-10 19:01:43 +0100
commit5ac356be526cc43105421194f6939ed11b4beaa6 (patch)
treeb16f6430f62e1ced7e2c49133a8c43a8fd7a6f48 /krebs
parentc9032105eb4abe2eecbeeb31df7b62ed082bb6fc (diff)
parentb394c79051fbcf6cf072f2b9af75819d37cd2426 (diff)
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'krebs')
-rw-r--r--krebs/4lib/infest/prepare.sh1
-rw-r--r--krebs/default.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/krebs/4lib/infest/prepare.sh b/krebs/4lib/infest/prepare.sh
index 182a068ef..0bfc49380 100644
--- a/krebs/4lib/infest/prepare.sh
+++ b/krebs/4lib/infest/prepare.sh
@@ -66,6 +66,7 @@ prepare_debian() {
type bzip2 2>/dev/null || apt-get install bzip2
type git 2>/dev/null || apt-get install git
type rsync 2>/dev/null || apt-get install rsync
+ type curl 2>/dev/null || apt-get install curl
prepare_common
}
diff --git a/krebs/default.nix b/krebs/default.nix
index bfd6175d9..ad0205426 100644
--- a/krebs/default.nix
+++ b/krebs/default.nix
@@ -11,6 +11,7 @@ let out = {
inherit infest;
inherit init;
inherit nixos-install;
+ inherit populate;
};
deploy =