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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-04-04 01:16:18 -04:00
parent 8bb175d107 f75db89007
commit 2e2f4ac913
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Propellor/Config/Joey.hs
View File

@ -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]

11
Propellor/Config/Simple.hs
View File

@ -1,17 +1,20 @@
-- | This is the main configuration file for Propellor, and is used to build
-- the propellor program.
module Propellor.Config.Simple where
import Propellor
import Propellor.CmdLine
import qualified Propellor.Property.File as File
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.Network as Network
import qualified Propellor.Property.Ssh as Ssh
--import qualified Propellor.Property.Ssh as Ssh
import qualified Propellor.Property.Cron as Cron
import qualified Propellor.Property.Sudo as Sudo
--import qualified Propellor.Property.Sudo as Sudo
import qualified Propellor.Property.User as User
import qualified Propellor.Property.Hostname as Hostname
import qualified Propellor.Property.Reboot as Reboot
--import qualified Propellor.Property.Hostname as Hostname
--import qualified Propellor.Property.Reboot as Reboot
--import qualified Propellor.Property.Tor as Tor
import qualified Propellor.Property.Docker as Docker
main :: IO ()