summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-11-23 16:39:49 -0400
committerJoey Hess2014-11-23 16:40:21 -0400
commitbaba668033f86b7c91f6b15c58002ea4bdbf3da2 (patch)
tree8cac82bbfdc2dff3965cd0d857419b6403efd878 /src/Propellor
parentd8624e2e5df9baf6883eb91b4be8282fb4b62304 (diff)
hasSomePassword and hasPassword now default to using the name of the host as the Context for the password. To specify a different context, use hasSomePassword' and hasPassword' (API change)
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/OS.hs35
-rw-r--r--src/Propellor/Property/User.hs25
2 files changed, 37 insertions, 23 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 914fb9f3..c96e20b3 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -17,6 +17,10 @@ import qualified Propellor.Property.Debootstrap as Debootstrap
-- This can replace one Linux distribution with different one.
-- But, it can also fail and leave the system in an unbootable state.
--
+-- To avoid this property being accidentially used, you have to provide
+-- a Context containing the name of the host that you intend to apply the
+-- property to.
+--
-- This property only runs once. The cleanly installed system will have
-- a file /etc/propellor-cleaninstall, which indicates it was cleanly
-- installed.
@@ -26,7 +30,7 @@ import qualified Propellor.Property.Debootstrap as Debootstrap
-- working system. For example:
--
-- > & os (System (Debian Unstable) "amd64")
--- > & cleanInstall (confirm "com.example.foo") (BackupOldOS <> UseOldKernel)
+-- > & cleanInstall (Context "foo.example.com") (BackupOldOS <> UseOldKernel)
-- > `onChange` propertyList "fixing up after clean install"
-- > [ fixupNetworkInterfaces
-- > , fixupRootSsh
@@ -34,38 +38,33 @@ import qualified Propellor.Property.Debootstrap as Debootstrap
-- > -- , installGrub
-- > ]
-- > & Apt.installed ["ssh"]
+-- > & User.hasSomePassword "root"
+-- > & User.accountFor "joey"
+-- > & User.hasSomePassword "joey"
-- > -- rest of system properties here
-cleanInstallOnce :: Confirmation -> Exceptions -> Property
-cleanInstallOnce c = check (not <$> doesFileExist flagfile) $
+cleanInstallOnce :: Context -> Exceptions -> Property
+cleanInstallOnce (Context c) = check (not <$> doesFileExist flagfile) $
Property "OS cleanly installed" $ do
- confirm c
+ hostname <- asks hostName
+ when (hostname /= c) $
+ error "Run with bad context, not matching hostname. Not running cleanInstalOnce!"
error "TODO"
- -- debootstrap /new-os chroot; avoid running
- -- propellor inside the chroot yet
+ -- debootstrap /new-os chroot, but don't run propellor
+ -- inside the chroot.
-- unmount all mounts
-- move all directories to /old-os,
-- except for /boot and /lib/modules
-- move /new-os to /
- -- touch /etc/propellor-cleaninstall
+ -- touch flagfile
-- re-bootstrap propellor in /usr/local/propellor,
-- (using git repo bundle, privdata file, and possibly
-- git repo url, which all need to be arranged to
-- be present in /old-os's /usr/local/propellor)
+ -- enable shadow passwords (to avoid foot-shooting)
-- return MadeChange
where
flagfile = "/etc/propellor-cleaninstall"
--- | To confirm you really intend to apply a dangerous Property to a
--- system, and have not copied and pasted it in by accident, you must
--- provide as confirmation, the hostname of the system you intend
--- to apply the Property to, written in the form form "com.example.somehost"
-newtype Confirmation = Confirmation String
-
-confirm :: String -> Confirmation
-confirm (Confirmation c) h
- | h ==(intercalate "." $ reverse $ split "." c) = return ()
- | otherwise = error "Bad confirmation of dangerous Property; see the documentation to fix this."
-
-- | Sometimes you want an almost clean install, but with some exceptions.
data Exceptions
= UseOldKernel -- ^ Leave /boot and /lib/modules from old OS, so the system can boot using them as before
diff --git a/src/Propellor/Property/User.hs b/src/Propellor/Property/User.hs
index 6a51703a..434a92a3 100644
--- a/src/Propellor/Property/User.hs
+++ b/src/Propellor/Property/User.hs
@@ -24,12 +24,27 @@ nuked user _ = check (isJust <$> catchMaybeIO (homedir user)) $ cmdProperty "use
-- | Only ensures that the user has some password set. It may or may
-- not be the password from the PrivData.
-hasSomePassword :: UserName -> Context -> Property
-hasSomePassword user context = check ((/= HasPassword) <$> getPasswordStatus user) $
- hasPassword user context
+hasSomePassword :: UserName -> Property
+hasSomePassword user = property (user ++ "has password") $ do
+ hostname <- asks hostName
+ ensureProperty $ hasSomePassword' user (Context hostname)
-hasPassword :: UserName -> Context -> Property
-hasPassword user context = withPrivData (Password user) context $ \getpassword ->
+-- | While hasSomePassword uses the name of the host as context,
+-- this allows specifying a different context. This is useful when
+-- you want to use the same password on multiple hosts, for example.
+hasSomePassword' :: UserName -> Context -> Property
+hasSomePassword' user context = check ((/= HasPassword) <$> getPasswordStatus user) $
+ hasPassword' user context
+
+-- | Ensures that a user's password is set to the password from the PrivData.
+-- (Will change any existing password.)
+hasPassword :: UserName -> Property
+hasPassword user = property (user ++ "has password") $ do
+ hostname <- asks hostName
+ ensureProperty $ hasPassword' user (Context hostname)
+
+hasPassword' :: UserName -> Context -> Property
+hasPassword' user context = withPrivData (Password user) context $ \getpassword ->
property (user ++ " has password") $
getpassword $ \password -> makeChange $
withHandle StdinHandle createProcessSuccess