summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 01:16:16 -0400
committerJoey Hess2014-04-04 01:16:16 -0400
commitf75db890075571b45b88b62e14b15cf85ad90cdc (patch)
treedb43ee9d6a5fcfd0c9c00f3b145f1ca751fb2992 /Propellor
parentccc82907124ccd2ad4951c2c4946ae20af007530 (diff)
improve
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/Config/Joey.hs6
-rw-r--r--Propellor/Config/Simple.hs11
2 files changed, 11 insertions, 6 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]
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 ()