summaryrefslogtreecommitdiff
path: root/Propellor/Config/Simple.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/Simple.hs
parent8bb175d1078de6add55f5c5f689693495d141436 (diff)
parentf75db890075571b45b88b62e14b15cf85ad90cdc (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'Propellor/Config/Simple.hs')
-rw-r--r--Propellor/Config/Simple.hs11
1 files changed, 7 insertions, 4 deletions
diff --git a/Propellor/Config/Simple.hs b/Propellor/Config/Simple.hs
index 840bad02..2b379b0d 100644
--- a/Propellor/Config/Simple.hs
+++ b/Propellor/Config/Simple.hs
@@ -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 ()