hasSomePassword and hasPassword now check to make sure shadow passwords are enabled.

config-joey.hs

@@ -57,8 +57,7 @@ testvm = host "testvm.kitenet.net"
 	& os (System (Debian Unstable) "amd64")
 	& OS.cleanInstallOnce (OS.Confirmed "testvm.kitenet.net")
 	 	`onChange` propertyList "fixing up after clean install"
-	 		[ User.shadowConfig True
+	 		[ OS.preserveRootSshAuthorized
-			, OS.preserveRootSshAuthorized
 			, OS.preserveResolvConf
 			, Apt.update
 			, Grub.boots "/dev/sda"

debian/changelog

@@ -21,6 +21,8 @@ propellor (1.1.0) UNRELEASED; urgency=medium
   * 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)
+  * hasSomePassword and hasPassword now check to make sure shadow passwords
+    are enabled.
   * cron.runPropellor now runs propellor, rather than using its Makefile.
     This is more robust.
   * propellor.debug can be set in the git config to enable more persistent

src/Propellor/Property/OS.hs

@@ -45,8 +45,7 @@ import Control.Exception (throw)
 -- > & os (System (Debian Unstable) "amd64")
 -- > & cleanInstallOnce (Confirmed "foo.example.com")
 -- >    `onChange` propertyList "fixing up after clean install"
--- >        [ User.shadowConfig True
+-- >        [ preserveNetworkInterfaces
--- >        , preserveNetworkInterfaces
 -- >        , preserveResolvConf
 -- >        , preserverRootSshAuthorized
 -- >        , Apt.update

src/Propellor/Property/User.hs

@@ -44,13 +44,15 @@ hasPassword user = property (user ++ "has password") $ do
 	ensureProperty $ hasPassword' user (Context hostname)
 
 hasPassword' :: UserName -> Context -> Property
-hasPassword' user context = withPrivData (Password user) context $ \getpassword ->
+hasPassword' user context = go `requires` shadowConfig True
-	property (user ++ " has password") $
+  where
-		getpassword $ \password -> makeChange $
+	go = withPrivData (Password user) context $ \getpassword ->
-			withHandle StdinHandle createProcessSuccess
+		property (user ++ " has password") $
-				(proc "chpasswd" []) $ \h -> do
+			getpassword $ \password -> makeChange $
-					hPutStrLn h $ user ++ ":" ++ password
+				withHandle StdinHandle createProcessSuccess
-					hClose h
+					(proc "chpasswd" []) $ \h -> do
+						hPutStrLn h $ user ++ ":" ++ password
+						hClose h
 
 lockedPassword :: UserName -> Property
 lockedPassword user = check (not <$> isLockedPassword user) $ cmdProperty "passwd"