From 516986cebd0030f0d599bec3b1a952344d9d9e9f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Aug 2015 20:29:30 -0700 Subject: propellor spin --- config-joey.hs | 5 ++++- src/Propellor/Property/Mount.hs | 3 ++- src/Propellor/Property/Parted.hs | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config-joey.hs b/config-joey.hs index acb20112..979e023b 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -34,7 +34,7 @@ import qualified Propellor.Property.SiteSpecific.GitAnnexBuilder as GitAnnexBuil import qualified Propellor.Property.SiteSpecific.IABak as IABak import qualified Propellor.Property.SiteSpecific.Branchable as Branchable import qualified Propellor.Property.SiteSpecific.JoeySites as JoeySites - +import Propellor.Property.Parted main :: IO () -- _ ______`| ,-.__ main = defaultMain hosts -- / \___-=O`/|O`/__| (____.' @@ -80,6 +80,9 @@ darkstar = host "darkstar.kitenet.net" & JoeySites.postfixClientRelay (Context "darkstar.kitenet.net") & JoeySites.dkimMilter + & partitioned YesReallyDeleteDiskContents "/home/joey/disk" + (PartTable MSDOS [ mkPartition EXT3 268435456 ]) + gnu :: Host gnu = host "gnu.kitenet.net" & Apt.buildDep ["git-annex"] `period` Daily diff --git a/src/Propellor/Property/Mount.hs b/src/Propellor/Property/Mount.hs index ff47f4d9..43ca0cc6 100644 --- a/src/Propellor/Property/Mount.hs +++ b/src/Propellor/Property/Mount.hs @@ -3,7 +3,8 @@ module Propellor.Property.Mount where import Propellor import Utility.Path -type FsType = String +type FsType = String -- ^ type of filesystem to mount ("auto" to autodetect) + type Source = String -- | Lists all mount points of the system. diff --git a/src/Propellor/Property/Parted.hs b/src/Propellor/Property/Parted.hs index 2b741234..6d125b85 100644 --- a/src/Propellor/Property/Parted.hs +++ b/src/Propellor/Property/Parted.hs @@ -6,6 +6,7 @@ module Propellor.Property.Parted ( Partition(..), mkPartition, Partition.Fs(..), + ByteSize, Partition.MkfsOpts, PartType(..), PartFlag(..), @@ -110,7 +111,7 @@ data Eep = YesReallyDeleteDiskContents -- | Partitions a disk using parted, and formats the partitions. -- --- The FilePath can be a block device (eg, /dev/sda), or a disk image file. +-- The FilePath can be a block device (eg, \/dev\/sda), or a disk image file. -- -- This deletes any existing partitions in the disk! Use with EXTREME caution! partitioned :: Eep -> FilePath -> PartTable -> Property NoInfo -- cgit v1.2.3