Merge branch 'joeyconfig'

config-joey.hs

@@ -366,9 +366,9 @@ standardSystemUnhardened hn suite arch motd = host hn
 	& Apt.installed ["etckeeper"]
 	& Apt.installed ["ssh"]
 	& GitHome.installedFor "root"
-	& User.hasSomePassword "root" (Context hn)
+	& User.hasSomePassword "root"
 	& User.accountFor "joey"
-	& User.hasSomePassword "joey" (Context hn)
+	& User.hasSomePassword "joey"
 	& Sudo.enabledFor "joey"
 	& GitHome.installedFor "joey"
 	& Apt.installed ["vim", "screen", "less"]

config-simple.hs

@@ -29,7 +29,7 @@ hosts =
 		& Apt.unattendedUpgrades
 		& Apt.installed ["etckeeper"]
 		& Apt.installed ["ssh"]
-		& User.hasSomePassword "root" (Context "mybox.example.com")
+		& User.hasSomePassword "root"
 		& Network.ipv6to4
 		& File.dirExists "/var/www"
 		& Docker.docked webserverContainer

debian/changelog

@@ -1,4 +1,4 @@
-propellor (1.0.1) UNRELEASED; urgency=medium
+propellor (1.1.0) UNRELEASED; urgency=medium
 
   * propellor --spin can now deploy propellor to hosts that do not have 
     git, ghc, or apt-get. This is accomplished by uploading a fairly
@@ -12,6 +12,9 @@ propellor (1.0.1) UNRELEASED; urgency=medium
     find the full hostname.
   * Added group-related properties. Thanks, Félix Sipma.
   * Added Git.barerepo. Thanks, Félix Sipma.
+  * 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)
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Nov 2014 00:12:35 -0400
 

propellor.cabal

@@ -1,5 +1,5 @@
 Name: propellor
-Version: 1.0.0
+Version: 1.1.0
 Cabal-Version: >= 1.6
 License: BSD3
 Maintainer: Joey Hess <id@joeyh.name>

src/Propellor/Property/OS.hs

@@ -0,0 +1,107 @@
+module Propellor.Property.OS (
+	cleanInstallOnce,
+	Confirmation
+	confirm,
+	fixupNetworkAddresses,
+	fixupRootSsh,
+	oldOSRemoved,
+) where
+
+import Propellor
+import qualified Propellor.Property.Chroot as Chroot
+import qualified Propellor.Property.Debootstrap as Debootstrap
+
+-- | Replaces whatever OS was installed before with a clean installation
+-- of the OS that the Host is configured to have.
+--
+-- 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.
+--
+-- You will typically want to run some more properties after the clean
+-- install, to bootstrap from the cleanly installed system to a fully
+-- working system. For example:
+--
+-- > & os (System (Debian Unstable) "amd64")
+-- > & cleanInstall (Context "foo.example.com") (BackupOldOS <> UseOldKernel)
+-- >    `onChange` propertyList "fixing up after clean install"
+-- >        [ fixupNetworkInterfaces
+-- >        , fixupRootSsh
+-- >        -- , installDistroKernel
+-- >        -- , installGrub
+-- >        ]
+-- > & Apt.installed ["ssh"]
+-- > & User.hasSomePassword "root"
+-- > & User.accountFor "joey"
+-- > & User.hasSomePassword "joey"
+-- > -- rest of system properties here
+cleanInstallOnce :: Context -> Exceptions -> Property
+cleanInstallOnce (Context c) = check (not <$> doesFileExist flagfile) $
+	Property "OS cleanly installed" $ do
+		hostname <- asks hostName
+		when (hostname /= c) $
+			error "Run with bad context, not matching hostname. Not running cleanInstalOnce!"
+		error "TODO"
+		-- 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 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"
+
+-- | 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
+	| BackupOldOS -- ^ Back up old OS to /old-os, to avoid losing any important files
+	| NoExceptions
+	| CombinedExceptions Exceptions Exceptions
+
+instance Monoid Exceptions where
+	mempty = NoExceptions
+	mappend = CombinedExceptions
+
+-- /etc/network/interfaces is configured to bring up all interfaces that
+-- are currently up, using the same IP addresses.
+--
+-- This property only does anything if it comes after cleanInstall,
+-- in the same propellor run where cleanInstall has made a change.
+fixupNetworkInterfaces :: Property
+fixupNetworkInterfaces = undefined
+
+-- /root/.ssh/authorized_keys is copied from the old os
+fixupRootSsh :: Property
+fixupRootSsh = undefined
+
+-- Installs an appropriate kernel from the distribution.
+installDistroKernel :: Property
+installDistroKernel = undefined
+
+-- Installs grub to boot the system.
+installGrub :: Property
+installGrub = undefined
+
+-- Removes the old OS's backup from /old-os
+oldOSRemoved :: Property
+oldOSRemoved = check (doesDirectoryExist oldOsDir) $
+	Property "old OS backup removed" $ liftIO $ do
+		removeDirectoryRecursive oldOsDir
+		return MadeChange
+
+oldOsDir :: FilePath
+oldOsDir = "/old-os"

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 :: UserName -> Property
-hasSomePassword user context = check ((/= HasPassword) <$> getPasswordStatus user) $
+hasSomePassword user = property (user ++ "has password") $ do
-	hasPassword user context
+	hostname <- asks hostName
+	ensureProperty $ hasSomePassword' user (Context hostname)
 
-hasPassword :: UserName -> Context -> Property
+-- | While hasSomePassword uses the name of the host as context,
-hasPassword user context = withPrivData (Password user) context $ \getpassword ->
+-- 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