diff options
author | Joey Hess <joey@kitenet.net> | 2014-03-30 23:59:07 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-03-30 23:59:07 -0400 |
commit | 0515fcb0f93ef90270dcd2c475194be1c439b578 (patch) | |
tree | fabc23fe79500ea30b33c3bbfed193ef0993b97d | |
parent | 8621fa6e9983a39c07a9677eac324ebcee79b549 (diff) |
more prep
-rw-r--r-- | Propellor/Property/Docker.hs | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | config.hs (renamed from propellor.hs) | 3 | ||||
-rw-r--r-- | propellor.cabal | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 43c78d85..3f7e470e 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -4,8 +4,8 @@ import Propellor import qualified Propellor.Property.File as File import qualified Propellor.Property.Apt as Apt -{- | Configures docker with an authentication file, so that images can be - - pushed to index.docker.io. -} +-- | Configures docker with an authentication file, so that images can be +-- pushed to index.docker.io. configured :: Property configured = Property "docker configured" go `requires` installed where @@ -11,7 +11,7 @@ to a system, and "make" can be used to pull down any new changes, and compile and run propellor. This can be done by a cron job, or something can ssh in and run it. -Properties are defined using Haskell. Edit propellor.hs to get started. +Properties are defined using Haskell. Edit config.hs to get started. There is no special language as used in puppet, chef, ansible, etc.. just the full power of Haskell. Hopefully that power can be put to good use in diff --git a/propellor.hs b/config.hs index ccfea866..6cad0710 100644 --- a/propellor.hs +++ b/config.hs @@ -1,3 +1,6 @@ +{- This is the main configuration file for Propellor, and is used to build + - the propellor program. -} + import Propellor import Propellor.CmdLine import qualified Propellor.Property.File as File diff --git a/propellor.cabal b/propellor.cabal index 25a6f29b..f0640540 100644 --- a/propellor.cabal +++ b/propellor.cabal @@ -24,7 +24,7 @@ Description: git clone git://git.kitenet.net/propellor Executable propellor - Main-Is: propellor.hs + Main-Is: config.hs GHC-Options: -Wall Build-Depends: MissingH, directory, filepath, base >= 4.5, base < 5, IfElse, process, bytestring, hslogger, unix-compat, ansi-terminal, |