summaryrefslogtreecommitdiff
path: root/Propellor/Types.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Propellor/Types.hs')
-rw-r--r--Propellor/Types.hs28
1 files changed, 2 insertions, 26 deletions
diff --git a/Propellor/Types.hs b/Propellor/Types.hs
index b8f8f167..5f575daf 100644
--- a/Propellor/Types.hs
+++ b/Propellor/Types.hs
@@ -6,8 +6,6 @@ module Propellor.Types
( Host(..)
, Attr
, HostName
- , UserName
- , GroupName
, Propellor(..)
, Property(..)
, RevertableProperty(..)
@@ -19,16 +17,12 @@ module Propellor.Types
, requires
, Desc
, Result(..)
- , System(..)
- , Distribution(..)
- , DebianSuite(..)
- , Release
- , Architecture
, ActionResult(..)
, CmdLine(..)
, PrivDataField(..)
, GpgKeyId
, SshKeyType(..)
+ , module Propellor.Types.OS
) where
import Data.Monoid
@@ -38,12 +32,10 @@ import "mtl" Control.Monad.Reader
import "MonadCatchIO-transformers" Control.Monad.CatchIO
import Propellor.Types.Attr
+import Propellor.Types.OS
data Host = Host [Property] (Attr -> Attr)
-type UserName = String
-type GroupName = String
-
-- | Propellor's monad provides read-only access to attributes of the
-- system.
newtype Propellor p = Propellor { runWithAttr :: ReaderT Attr IO p }
@@ -119,22 +111,6 @@ instance Monoid Result where
mappend _ MadeChange = MadeChange
mappend NoChange NoChange = NoChange
--- | High level descritption of a operating system.
-data System = System Distribution Architecture
- deriving (Show)
-
-data Distribution
- = Debian DebianSuite
- | Ubuntu Release
- deriving (Show)
-
-data DebianSuite = Experimental | Unstable | Testing | Stable | DebianRelease Release
- deriving (Show, Eq)
-
-type Release = String
-
-type Architecture = String
-
-- | Results of actions, with color.
class ActionResult a where
getActionResult :: a -> (String, ColorIntensity, Color)