summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 23:50:38 -0400
committerJoey Hess2014-11-18 23:50:38 -0400
commit745f9e268511fb13743dfa10476fa03c616fcdf1 (patch)
tree6bffcf24eff60ffcd1770088b6aac12bcb65de25
parentdac6a874195a521714db48083b3222c2c8b41fa9 (diff)
clean up Propellr.CmdLine exports
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/CmdLine.hs6
2 files changed, 6 insertions, 2 deletions
diff --git a/propellor.cabal b/propellor.cabal
index c0b8624e..82880d1e 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -101,6 +101,7 @@ Library
Propellor.Property.SiteSpecific.GitHome
Propellor.Property.SiteSpecific.JoeySites
Propellor.Property.SiteSpecific.GitAnnexBuilder
+ Propellor.CmdLine
Propellor.Info
Propellor.Message
Propellor.PrivData
@@ -112,7 +113,6 @@ Library
Propellor.Types.PrivData
Other-Modules:
Propellor.Types.Info
- Propellor.CmdLine
Propellor.Git
Propellor.Gpg
Propellor.Server
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 0ae79ac3..9006d903 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -1,4 +1,7 @@
-module Propellor.CmdLine where
+module Propellor.CmdLine (
+ defaultMain,
+ processCmdLine,
+) where
import System.Environment (getArgs)
import Data.List
@@ -68,6 +71,7 @@ processCmdLine = go =<< getArgs
Just pf -> return $ f pf (Context c)
Nothing -> errorMessage $ "Unknown privdata field " ++ s
+-- | Runs propellor on hosts, as controlled by command-line options.
defaultMain :: [Host] -> IO ()
defaultMain hostlist = do
DockerShim.cleanEnv