summaryrefslogtreecommitdiff
path: root/Propellor.hs
diff options
context:
space:
mode:
authorJoey Hess2014-03-30 19:10:32 -0400
committerJoey Hess2014-03-30 19:10:32 -0400
commit61d8214d9d8cea6ba047d1a26f9edc1ea180234b (patch)
tree1e9f0184af88eed1dd5974bf2f47b0765c23b321 /Propellor.hs
parent4e442f4bcf04a68f638393d180ac7664ddd0fe4b (diff)
propellor spin
Diffstat (limited to 'Propellor.hs')
-rw-r--r--Propellor.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Propellor.hs b/Propellor.hs
index 421df2c4..01671786 100644
--- a/Propellor.hs
+++ b/Propellor.hs
@@ -1,5 +1,5 @@
import Common
-import HostName
+import CmdLine
import qualified Property.File as File
import qualified Property.Apt as Apt
import qualified Property.Ssh as Ssh
@@ -10,7 +10,7 @@ import qualified Property.Tor as Tor
import qualified Property.GitHome as GitHome
main :: IO ()
-main = ensureProperties . getProperties =<< getHostName
+main = defaultMain getProperties
{- This is where the system's HostName, either as returned by uname
- or one specified on the command line, is converted into a list of
@@ -21,6 +21,7 @@ getProperties hostname@"clam.kitenet.net" =
, standardSystem Apt.Unstable
-- Clam is a tor bridge.
, Tor.isBridge
+ , Apt.installed ["docker.io"]
-- This is not an important system so I don't want to need to
-- manually upgrade it.
, Apt.unattendedUpgrades True