cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

propellor spin

This commit is contained in:
Joey Hess 2014-04-10 00:37:03 -04:00
parent fbd1e5c109
commit b13574372c
Failed to extract signature
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Propellor/CmdLine.hs
View File

@ -192,7 +192,7 @@ spin host = do
bootstrapcmd = shellWrap $ intercalate " ; " bootstrapcmd = shellWrap $ intercalate " ; "
[ "if [ ! -d " ++ localdir ++ " ]" [ "if [ ! -d " ++ localdir ++ " ]"
, "then " ++ intercalate " && " , "then " ++ intercalate " && "
[ "apt-get -y install git" [ "apt-get -y install git make"
, "echo " ++ toMarked statusMarker (show NeedGitClone) , "echo " ++ toMarked statusMarker (show NeedGitClone)
] ]
, "else " ++ intercalate " && " , "else " ++ intercalate " && "

7
config-joey.hs
View File

@ -59,10 +59,11 @@ host hostname@"diatom.kitenet.net" = Just $ props
& standardSystem Stable & standardSystem Stable
& Hostname.set hostname & Hostname.set hostname
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Apt.serviceInstalledRunning "apache2"
& Apt.serviceInstalledRunning "bind9"
& Apt.serviceInstalledRunning "ntp" & 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 & Apt.buildDep ["git-annex"] `period` Daily
-- My laptop -- My laptop
host _hostname@"darkstar.kitenet.net" = Just $ props host _hostname@"darkstar.kitenet.net" = Just $ props