summaryrefslogtreecommitdiff
path: root/Propellor/Config/Joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 01:16:18 -0400
committerJoey Hess2014-04-04 01:16:18 -0400
commit2e2f4ac91369adf39fed54df10864f320a8227c1 (patch)
tree340ff1eddd9d4fb55c2f6f3e9b762422d5193016 /Propellor/Config/Joey.hs
parent8bb175d1078de6add55f5c5f689693495d141436 (diff)
parentf75db890075571b45b88b62e14b15cf85ad90cdc (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'Propellor/Config/Joey.hs')
-rw-r--r--Propellor/Config/Joey.hs6
1 files changed, 4 insertions, 2 deletions
diff --git a/Propellor/Config/Joey.hs b/Propellor/Config/Joey.hs
index 530df9a3..c398c2f6 100644
--- a/Propellor/Config/Joey.hs
+++ b/Propellor/Config/Joey.hs
@@ -1,5 +1,7 @@
-- | This is the live config file used by propellor's author.
+module Propellor.Config.Joey where
+
import Propellor
import Propellor.CmdLine
import qualified Propellor.Property.File as File
@@ -16,9 +18,9 @@ import qualified Propellor.Property.Docker as Docker
import qualified Propellor.Property.SiteSpecific.GitHome as GitHome
import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuilder
import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites
-import Data.List
-- Only imported to make sure it continues to build.
-import qualified ConfigSimple as Simple
+import qualified Propellor.Config.Simple ()
+import Data.List
main :: IO ()
main = defaultMain [host, Docker.containerProperties container]