summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-10 00:37:03 -0400
committerJoey Hess2014-04-10 00:37:03 -0400
commitb13574372c70b0b83ca4d68699f2c3e2b46071d0 (patch)
treed75be78d859afbd7ebfef39b66a7dbc40ab07d59
parentfbd1e5c109968cb127f4535031e4dfbe753a8996 (diff)
propellor spin
-rw-r--r--Propellor/CmdLine.hs2
-rw-r--r--config-joey.hs7
2 files changed, 5 insertions, 4 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index a7cacdca..ca155568 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -192,7 +192,7 @@ spin host = do
bootstrapcmd = shellWrap $ intercalate " ; "
[ "if [ ! -d " ++ localdir ++ " ]"
, "then " ++ intercalate " && "
- [ "apt-get -y install git"
+ [ "apt-get -y install git make"
, "echo " ++ toMarked statusMarker (show NeedGitClone)
]
, "else " ++ intercalate " && "
diff --git a/config-joey.hs b/config-joey.hs
index 069ea39f..dfa56e58 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -59,10 +59,11 @@ host hostname@"diatom.kitenet.net" = Just $ props
& standardSystem Stable
& Hostname.set hostname
& Apt.unattendedUpgrades
- & Apt.serviceInstalledRunning "apache2"
- & Apt.serviceInstalledRunning "bind9"
& Apt.serviceInstalledRunning "ntp"
- & Apt.installed ["git", "git-annex"]
+ & Apt.serviceInstalledRunning "bind9"
+ & Apt.serviceInstalledRunning "apache2"
+ & Apt.serviceInstalledRunning "git-daemon-sysvinit"
+ & Apt.installed ["git", "git-annex", "rsync"]
& Apt.buildDep ["git-annex"] `period` Daily
-- My laptop
host _hostname@"darkstar.kitenet.net" = Just $ props