diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-09-03 08:53:40 -0700 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-09-03 08:54:06 -0700 |
| commit | 43a67e310740e58707d0a7908237641ef46f5ae6 (patch) | |
| tree | 89df6bbb593bc85f8a443316c16dd4cd893f97d1 /config-joey.hs | |
| parent | f158d1cf81c2fe4ece5320dd725496043e5b953d (diff) | |
| parent | 776b4dc3b24f8d30fa0fe56254c16e613d8e0bbe (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'config-joey.hs')
| -rw-r--r-- | config-joey.hs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs index 71b1a4ae..2bb2f1bd 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 +import Propellor.Property.DiskImage main :: IO () -- _ ______`| ,-.__ main = defaultMain hosts -- / \___-=O`/|O`/__| (____.' @@ -80,8 +80,14 @@ darkstar = host "darkstar.kitenet.net" & JoeySites.postfixClientRelay (Context "darkstar.kitenet.net") & JoeySites.dkimMilter - & partitioned YesReallyDeleteDiskContents "/home/joey/disk" - (PartTable MSDOS [ mkPartition EXT3 (MegaBytes 256), mkPartition LinuxSwap (MegaBytes 16)]) + & imageBuilt "/tmp/img" c MSDOS + [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag + , partition EXT4 `mountedAt` "/" `addFreeSpace` MegaBytes 100 + , swapPartition (MegaBytes 256) + ] noFinalization -- (grubBooted PC) + where + c d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d + & Apt.installed ["linux-image-amd64"] gnu :: Host gnu = host "gnu.kitenet.net" |