summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 19:49:53 -0400
committerJoey Hess2014-11-23 19:49:53 -0400
commitf85026da7f31c9896bf0207e3d58a7f080be82fc (patch)
tree32d0dadb398ddc21eb2c12c0659621ac93b1f2f2 /src/Propellor/Property/OS.hs
parent1ac0c5bb5f86008dcd8304df42fcffaff881f727 (diff)
better property names
Diffstat (limited to 'src/Propellor/Property/OS.hs')
-rw-r--r--src/Propellor/Property/OS.hs22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index c96e20b3..099596fe 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -3,7 +3,9 @@ module Propellor.Property.OS (
Confirmation
confirm,
fixupNetworkAddresses,
- fixupRootSsh,
+ rootSshAuthorized,
+ grubBoots,
+ kernelInstalled,
oldOSRemoved,
) where
@@ -33,9 +35,9 @@ import qualified Propellor.Property.Debootstrap as Debootstrap
-- > & cleanInstall (Context "foo.example.com") (BackupOldOS <> UseOldKernel)
-- > `onChange` propertyList "fixing up after clean install"
-- > [ fixupNetworkInterfaces
--- > , fixupRootSsh
--- > -- , installDistroKernel
--- > -- , installGrub
+-- > , rootSshAuthorized
+-- > -- , kernelInstalled
+-- > -- , grubBoots "hd0"
-- > ]
-- > & Apt.installed ["ssh"]
-- > & User.hasSomePassword "root"
@@ -85,16 +87,16 @@ fixupNetworkInterfaces :: Property
fixupNetworkInterfaces = undefined
-- /root/.ssh/authorized_keys is copied from the old os
-fixupRootSsh :: Property
-fixupRootSsh = undefined
+rootSshAuthorized :: Property
+rootSshAuthorized = undefined
-- Installs an appropriate kernel from the distribution.
-installDistroKernel :: Property
-installDistroKernel = undefined
+kernelInstalled :: Property
+kernelInstalled = undefined
-- Installs grub to boot the system.
-installGrub :: Property
-installGrub = undefined
+grubBoots :: GrubDev -> Property
+grubBoots = undefined
-- Removes the old OS's backup from /old-os
oldOSRemoved :: Property