From 071adf44e85219ce4d4b8b096c9fd5efaaa6997a Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 14:13:51 -0400
Subject: LightDM.autoLogin: Make it require LightDM.installed

(minor API change as the type changed)
---
 src/Propellor/Property/LightDM.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Propellor/Property/LightDM.hs b/src/Propellor/Property/LightDM.hs
index 339fa9a3..69538d89 100644
--- a/src/Propellor/Property/LightDM.hs
+++ b/src/Propellor/Property/LightDM.hs
@@ -10,7 +10,8 @@ installed :: Property DebianLike
 installed = Apt.installed ["lightdm"]
 
 -- | Configures LightDM to skip the login screen and autologin as a user.
-autoLogin :: User -> Property UnixLike
+autoLogin :: User -> Property DebianLike
 autoLogin (User u) = "/etc/lightdm/lightdm.conf" `ConfFile.containsIniSetting`
 	("SeatDefaults", "autologin-user", u)
 	`describe` "lightdm autologin"
+	`requires` installed
-- 
cgit v1.3-2-g0d8e


From c282a894b56012ae4f68b518e5fad01052ac4f22 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:01:55 -0400
Subject: XFCE and applyPath properties

* Propellor.Property.XFCE added with some useful properties for the
  desktop environment.
* Added File.applyPath property.

This commit was sponsored by Riku Voipio.
---
 debian/changelog                    |  3 +++
 propellor.cabal                     |  1 +
 src/Propellor/Property.hs           |  1 +
 src/Propellor/Property/DiskImage.hs |  6 +++++-
 src/Propellor/Property/File.hs      | 16 +++++++++++++++-
 src/Propellor/Property/XFCE.hs      | 38 +++++++++++++++++++++++++++++++++++++
 6 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 src/Propellor/Property/XFCE.hs

(limited to 'src')

diff --git a/debian/changelog b/debian/changelog
index 743667a5..e92a24e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ propellor (4.1.0) UNRELEASED; urgency=medium
     process was done; now output will be displayed immediately.
   * LightDM.autoLogin: Make it require LightDM.installed.
     (minor API change as the type changed)
+  * Propellor.Property.XFCE added with some useful properties for the
+    desktop environment.
+  * Added File.applyPath property.
 
  -- Joey Hess <id@joeyh.name>  Tue, 20 Jun 2017 10:55:37 -0400
 
diff --git a/propellor.cabal b/propellor.cabal
index abf5f05b..76646fb4 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -153,6 +153,7 @@ Library
     Propellor.Property.Unbound
     Propellor.Property.User
     Propellor.Property.Uwsgi
+    Propellor.Property.XFCE
     Propellor.Property.ZFS
     Propellor.Property.ZFS.Process
     Propellor.Property.ZFS.Properties
diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs
index 8b2a4e3d..55e688ab 100644
--- a/src/Propellor/Property.hs
+++ b/src/Propellor/Property.hs
@@ -50,6 +50,7 @@ import Data.Monoid
 import Control.Monad.IfElse
 import "mtl" Control.Monad.RWS.Strict
 import System.Posix.Files
+import Data.Maybe
 import Data.List
 import Data.Hashable
 import Control.Applicative
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index d5898d7c..89a8d0c6 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -49,7 +49,11 @@ type DiskImage = FilePath
 -- First the specified Chroot is set up, and its properties are satisfied.
 --
 -- Then, the disk image is set up, and the chroot is copied into the
--- appropriate partition(s) of it.
+-- appropriate partition(s) of it. 
+--
+-- The partitions default to being sized just large enough to fit the files
+-- from the chroot. You can use `addFreeSpace` to make them a bit larger
+-- than that, or `setSize` to use a fixed size.
 -- 
 -- Note that the disk image file is reused if it already exists,
 -- to avoid expensive IO to generate a new one. And, it's updated in-place,
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index 459fe2c7..fcfcade1 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, FlexibleContexts #-}
 
 module Propellor.Property.File where
 
@@ -177,6 +177,20 @@ ownerGroup f (User owner) (Group group) = p `describe` (f ++ " owner " ++ og)
 		`changesFile` f
 	og = owner ++ ":" ++ group
 
+-- | Given a base directory, and a relative path under that
+-- directory, applies a property to each component of the path in turn, 
+-- starting with the base directory.
+--
+-- For example, to make a file owned by a user, making sure their home
+-- directory and the subdirectories to it are also owned by them:
+--
+-- > "/home/user/program/file" `hasContent` ["foo"]
+-- > 	`before` applyPath "/home/user" ".config/program/file" 
+-- > 		(\f -> ownerGroup f (User "user") (Group "user"))
+applyPath :: Monoid (Property metatypes) => FilePath -> FilePath -> (FilePath -> Property metatypes) -> Property metatypes
+applyPath basedir relpath mkp = mconcat $ 
+	map mkp (scanl (</>) basedir (splitPath relpath))
+
 -- | Ensures that a file/dir has the specfied mode.
 mode :: FilePath -> FileMode -> Property UnixLike
 mode f v = p `changesFile` f
diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
new file mode 100644
index 00000000..e75946a5
--- /dev/null
+++ b/src/Propellor/Property/XFCE.hs
@@ -0,0 +1,38 @@
+module Propellor.Property.XFCE where
+
+import Propellor.Base
+import Propellor.Types.Core (getSatisfy)
+import qualified Propellor.Property.Apt as Apt
+import qualified Propellor.Property.File as File
+import qualified Propellor.Property.User as User
+
+installed :: Property DebianLike
+installed = Apt.installed ["task-xfce-desktop"]
+
+-- | Minimal install of XFCE, with a terminal emulator and panel,
+-- and X, but not any of the extras.
+installedMin :: Property DebianLike
+installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
+
+-- | Normally at first login, XFCE asks what kind of panel the user wants.
+-- This enables the default configuration noninteractively.
+--
+-- If the user subsequently modifies their panel, their modifications will
+-- not be overwritten by this property.
+defaultPanelFor :: User -> Property DebianLike
+defaultPanelFor u@(User username) = adjustPropertySatisfy baseprop $ \s -> do
+	home <- liftIO $ User.homedir u
+	s <> fromMaybe mempty (getSatisfy (go home))
+  where
+	cf = ".config" </> "xfce4" </> "xfconf"
+		</> "xfce-perchannel-xml" </> "xfce4-panel.xml"
+	-- This location is probably Debian-specific.
+	defcf = "/etc/xdg/xfce4/panel/default.xml"
+	go :: FilePath -> Property DebianLike
+	go home = tightenTargets $
+		(home </> cf) `File.isCopyOf` defcf
+			`before` File.applyPath home cf
+				(\f -> File.ownerGroup f u (userGroup u))
+			`requires` Apt.installed ["xfce4-panel"]
+	baseprop :: Property DebianLike
+	baseprop = doNothing `describe` ("default XFCE panel for " ++ username)
-- 
cgit v1.3-2-g0d8e


From 1428b1f276a65a3a3c5a881905458df8fe0e6f62 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:20:47 -0400
Subject: propellor spin

---
 src/Propellor/Property/XFCE.hs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index e75946a5..4f3a152a 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -8,11 +8,13 @@ import qualified Propellor.Property.User as User
 
 installed :: Property DebianLike
 installed = Apt.installed ["task-xfce-desktop"]
+	`describe` "XFCE desktop installed"
 
 -- | Minimal install of XFCE, with a terminal emulator and panel,
 -- and X, but not any of the extras.
 installedMin :: Property DebianLike
 installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
+	`describe` "minimal XFCE desktop installed"
 
 -- | Normally at first login, XFCE asks what kind of panel the user wants.
 -- This enables the default configuration noninteractively.
-- 
cgit v1.3-2-g0d8e


From 20a5f616bd4c8c3acc78bc64f20832ca4784b5c7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:26:30 -0400
Subject: less wonky (and working) implementation of defaultPanelFor

---
 joeyconfig.hs                  | 3 +--
 src/Propellor/Property/XFCE.hs | 8 +++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/joeyconfig.hs b/joeyconfig.hs
index ff16777c..f8b26a2b 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -110,9 +110,8 @@ darkstar = host "darkstar.kitenet.net" $ props
 		`before` File.ownerGroup "/srv/propellor-disk.img" (User "joey") (Group "joey")
 
 demo :: Host
-demo = host "demo.kitenet.net" $ props
+demo = host "demo" $ props
 	& osDebian Unstable X86_64
-	& Hostname.setTo "demo"
 	& Apt.installed ["linux-image-amd64"]
 	& bootstrappedFrom GitRepoOutsideChroot
 	& User.accountFor user
diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index 4f3a152a..e3dd060e 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -1,7 +1,6 @@
 module Propellor.Property.XFCE where
 
 import Propellor.Base
-import Propellor.Types.Core (getSatisfy)
 import qualified Propellor.Property.Apt as Apt
 import qualified Propellor.Property.File as File
 import qualified Propellor.Property.User as User
@@ -22,10 +21,11 @@ installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
 -- If the user subsequently modifies their panel, their modifications will
 -- not be overwritten by this property.
 defaultPanelFor :: User -> Property DebianLike
-defaultPanelFor u@(User username) = adjustPropertySatisfy baseprop $ \s -> do
+defaultPanelFor u@(User username) = property' desc $ \w -> do
 	home <- liftIO $ User.homedir u
-	s <> fromMaybe mempty (getSatisfy (go home))
+	ensureProperty w (go home)
   where
+	desc = "default XFCE panel for " ++ username
 	cf = ".config" </> "xfce4" </> "xfconf"
 		</> "xfce-perchannel-xml" </> "xfce4-panel.xml"
 	-- This location is probably Debian-specific.
@@ -36,5 +36,3 @@ defaultPanelFor u@(User username) = adjustPropertySatisfy baseprop $ \s -> do
 			`before` File.applyPath home cf
 				(\f -> File.ownerGroup f u (userGroup u))
 			`requires` Apt.installed ["xfce4-panel"]
-	baseprop :: Property DebianLike
-	baseprop = doNothing `describe` ("default XFCE panel for " ++ username)
-- 
cgit v1.3-2-g0d8e


From 60db0d5761254f5074a5d312ebb498bf031379a5 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:38:16 -0400
Subject: rename confusing f' to src

f' normally means a later version of f
---
 src/Propellor/Property/File.hs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index fcfcade1..b1e72989 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -105,11 +105,11 @@ hasPrivContent' writemode source f context =
 
 -- | Replaces the content of a file with the transformed content of another file
 basedOn :: FilePath -> (FilePath, [Line] -> [Line]) -> Property UnixLike
-f `basedOn` (f', a) = property' desc $ \o -> do
-	tmpl <- liftIO $ readFile f'
+f `basedOn` (src, a) = property' desc $ \o -> do
+	tmpl <- liftIO $ readFile src
 	ensureProperty o $ fileProperty desc (\_ -> a $ lines $ tmpl) f
   where
-	desc = f ++ " is based on " ++ f'
+	desc = f ++ " is based on " ++ src
 
 -- | Removes a file. Does not remove symlinks or non-plain-files.
 notPresent :: FilePath -> Property UnixLike
@@ -150,23 +150,23 @@ link `isSymlinkedTo` (LinkTarget target) = property desc $
 
 -- | Ensures that a file is a copy of another (regular) file.
 isCopyOf :: FilePath -> FilePath -> Property UnixLike
-f `isCopyOf` f' = property desc $ go =<< (liftIO $ tryIO $ getFileStatus f')
+f `isCopyOf` src = property desc $ go =<< (liftIO $ tryIO $ getFileStatus src)
   where
-	desc = f ++ " is copy of " ++ f'
+	desc = f ++ " is copy of " ++ src
 	go (Right stat) = if isRegularFile stat
 		then gocmp =<< (liftIO $ cmp)
-		else warningMessage (f' ++ " is not a regular file") >>
+		else warningMessage (src ++ " is not a regular file") >>
 			return FailedChange
 	go (Left e) = warningMessage (show e) >> return FailedChange
 
-	cmp = safeSystem "cmp" [Param "-s", Param "--", File f, File f']
+	cmp = safeSystem "cmp" [Param "-s", Param "--", File f, File src]
 	gocmp ExitSuccess = noChange
 	gocmp (ExitFailure 1) = doit
 	gocmp _ = warningMessage "cmp failed" >> return FailedChange
 
-	doit = makeChange $ copy f' `viaStableTmp` f
-	copy src dest = unlessM (runcp src dest) $ errorMessage "cp failed"
-	runcp src dest = boolSystem "cp"
+	doit = makeChange $ copy `viaStableTmp` f
+	copy dest = unlessM (runcp dest) $ errorMessage "cp failed"
+	runcp dest = boolSystem "cp"
 		[Param "--preserve=all", Param "--", File src, File dest]
 
 -- | Ensures that a file/dir has the specified owner and group.
-- 
cgit v1.3-2-g0d8e


From f9f1158c0c0fc173045ec7bb7fcbacdd76b24ffd Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:42:57 -0400
Subject: avoid overwriting existing file

---
 src/Propellor/Property/XFCE.hs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index e3dd060e..a1b9d7d7 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -26,13 +26,15 @@ defaultPanelFor u@(User username) = property' desc $ \w -> do
 	ensureProperty w (go home)
   where
 	desc = "default XFCE panel for " ++ username
-	cf = ".config" </> "xfce4" </> "xfconf"
+	basecf = ".config" </> "xfce4" </> "xfconf"
 		</> "xfce-perchannel-xml" </> "xfce4-panel.xml"
 	-- This location is probably Debian-specific.
 	defcf = "/etc/xdg/xfce4/panel/default.xml"
 	go :: FilePath -> Property DebianLike
-	go home = tightenTargets $
-		(home </> cf) `File.isCopyOf` defcf
-			`before` File.applyPath home cf
+	go home = tightenTargets $ check (not <$> doesFileExist cf) $
+		cf `File.isCopyOf` defcf
+			`before` File.applyPath home basecf
 				(\f -> File.ownerGroup f u (userGroup u))
 			`requires` Apt.installed ["xfce4-panel"]
+	  where
+		cf = home </> basecf
-- 
cgit v1.3-2-g0d8e


From 36671f5c992905aa71722b16d800313f60a02622 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:46:36 -0400
Subject: add Overwrite configuration

---
 joeyconfig.hs                  |  2 +-
 src/Propellor/Property/XFCE.hs | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/joeyconfig.hs b/joeyconfig.hs
index f8b26a2b..20e73cef 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -118,7 +118,7 @@ demo = host "demo" $ props
 	& root `User.hasInsecurePassword` "debian"
 	& user `User.hasInsecurePassword` "debian"
 	& XFCE.installedMin
-	& XFCE.defaultPanelFor user
+	& XFCE.defaultPanelFor user OverwriteExisting
 	& LightDM.autoLogin user
 	& Apt.installed ["firefox"]
   where
diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index a1b9d7d7..e0c062ae 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -15,13 +15,12 @@ installedMin :: Property DebianLike
 installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
 	`describe` "minimal XFCE desktop installed"
 
+data Overwrite = OverwriteExisting | PreserveExisting
+
 -- | Normally at first login, XFCE asks what kind of panel the user wants.
 -- This enables the default configuration noninteractively.
---
--- If the user subsequently modifies their panel, their modifications will
--- not be overwritten by this property.
-defaultPanelFor :: User -> Property DebianLike
-defaultPanelFor u@(User username) = property' desc $ \w -> do
+defaultPanelFor :: User -> Overwrite -> Property DebianLike
+defaultPanelFor u@(User username) overwrite = property' desc $ \w -> do
 	home <- liftIO $ User.homedir u
 	ensureProperty w (go home)
   where
@@ -31,10 +30,13 @@ defaultPanelFor u@(User username) = property' desc $ \w -> do
 	-- This location is probably Debian-specific.
 	defcf = "/etc/xdg/xfce4/panel/default.xml"
 	go :: FilePath -> Property DebianLike
-	go home = tightenTargets $ check (not <$> doesFileExist cf) $
+	go home = tightenTargets $ checkoverwrite cf
 		cf `File.isCopyOf` defcf
 			`before` File.applyPath home basecf
 				(\f -> File.ownerGroup f u (userGroup u))
 			`requires` Apt.installed ["xfce4-panel"]
 	  where
 		cf = home </> basecf
+	checkoverwrite cf p = case overwrite of
+		OverwriteExisting -> p
+		PreserveExisting -> check (not <$> doesFileExist cf) p
-- 
cgit v1.3-2-g0d8e


From 256c5c3c572e56d3755914e40cfd9dfd94112bbb Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:47:12 -0400
Subject: File.isCopyOf: Fix bug that prevented this property from working when
 the destination file did not yet exist.

This commit was sponsored by andrea rota.
---
 debian/changelog               | 2 ++
 src/Propellor/Property/File.hs | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/debian/changelog b/debian/changelog
index e92a24e1..7917bbf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ propellor (4.1.0) UNRELEASED; urgency=medium
   * Propellor.Property.XFCE added with some useful properties for the
     desktop environment.
   * Added File.applyPath property.
+  * File.isCopyOf: Fix bug that prevented this property from working
+    when the destination file did not yet exist.
 
  -- Joey Hess <id@joeyh.name>  Tue, 20 Jun 2017 10:55:37 -0400
 
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index b1e72989..8d10b94c 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -154,7 +154,10 @@ f `isCopyOf` src = property desc $ go =<< (liftIO $ tryIO $ getFileStatus src)
   where
 	desc = f ++ " is copy of " ++ src
 	go (Right stat) = if isRegularFile stat
-		then gocmp =<< (liftIO $ cmp)
+		then ifM (liftIO $ doesFileExist f)
+			( gocmp =<< (liftIO $ cmp)
+			, doit
+			)
 		else warningMessage (src ++ " is not a regular file") >>
 			return FailedChange
 	go (Left e) = warningMessage (show e) >> return FailedChange
-- 
cgit v1.3-2-g0d8e


From 0d15c3f01a424e021481c9630441997c032cbc82 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 16:57:03 -0400
Subject: Added File.checkOverwrite.

This commit was sponsored by Ethan Aubin.
---
 debian/changelog               |  1 +
 joeyconfig.hs                  |  2 +-
 src/Propellor/Property/File.hs |  9 +++++++++
 src/Propellor/Property/XFCE.hs | 20 +++++++-------------
 4 files changed, 18 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/debian/changelog b/debian/changelog
index 7917bbf6..ea9f43bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ propellor (4.1.0) UNRELEASED; urgency=medium
   * Propellor.Property.XFCE added with some useful properties for the
     desktop environment.
   * Added File.applyPath property.
+  * Added File.checkOverwrite.
   * File.isCopyOf: Fix bug that prevented this property from working
     when the destination file did not yet exist.
 
diff --git a/joeyconfig.hs b/joeyconfig.hs
index 20e73cef..4286097b 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -118,7 +118,7 @@ demo = host "demo" $ props
 	& root `User.hasInsecurePassword` "debian"
 	& user `User.hasInsecurePassword` "debian"
 	& XFCE.installedMin
-	& XFCE.defaultPanelFor user OverwriteExisting
+	& XFCE.defaultPanelFor user File.OverwriteExisting
 	& LightDM.autoLogin user
 	& Apt.installed ["firefox"]
   where
diff --git a/src/Propellor/Property/File.hs b/src/Propellor/Property/File.hs
index 8d10b94c..3293599a 100644
--- a/src/Propellor/Property/File.hs
+++ b/src/Propellor/Property/File.hs
@@ -307,3 +307,12 @@ readConfigFileName = readish . unescape
 			Nothing -> '_' : ns ++ unescape cs'
 			Just n -> chr n : unescape cs'
 	unescape (c:cs) = c : unescape cs
+
+data Overwrite = OverwriteExisting | PreserveExisting
+
+-- | When passed PreserveExisting, only ensures the property when the file
+-- does not exist.
+checkOverwrite :: Overwrite -> FilePath -> (FilePath -> Property i) -> Property i
+checkOverwrite OverwriteExisting f mkp = mkp f
+checkOverwrite PreserveExisting f mkp = 
+	check (not <$> doesFileExist f) (mkp f)
diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index e0c062ae..6241326e 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -15,11 +15,9 @@ installedMin :: Property DebianLike
 installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
 	`describe` "minimal XFCE desktop installed"
 
-data Overwrite = OverwriteExisting | PreserveExisting
-
 -- | Normally at first login, XFCE asks what kind of panel the user wants.
 -- This enables the default configuration noninteractively.
-defaultPanelFor :: User -> Overwrite -> Property DebianLike
+defaultPanelFor :: User -> File.Overwrite -> Property DebianLike
 defaultPanelFor u@(User username) overwrite = property' desc $ \w -> do
 	home <- liftIO $ User.homedir u
 	ensureProperty w (go home)
@@ -30,13 +28,9 @@ defaultPanelFor u@(User username) overwrite = property' desc $ \w -> do
 	-- This location is probably Debian-specific.
 	defcf = "/etc/xdg/xfce4/panel/default.xml"
 	go :: FilePath -> Property DebianLike
-	go home = tightenTargets $ checkoverwrite cf
-		cf `File.isCopyOf` defcf
-			`before` File.applyPath home basecf
-				(\f -> File.ownerGroup f u (userGroup u))
-			`requires` Apt.installed ["xfce4-panel"]
-	  where
-		cf = home </> basecf
-	checkoverwrite cf p = case overwrite of
-		OverwriteExisting -> p
-		PreserveExisting -> check (not <$> doesFileExist cf) p
+	go home = tightenTargets $ 
+		File.checkOverwrite overwrite (home </> basecf) $ \cf ->
+			cf `File.isCopyOf` defcf
+				`before` File.applyPath home basecf
+					(\f -> File.ownerGroup f u (userGroup u))
+				`requires` Apt.installed ["xfce4-panel"]
-- 
cgit v1.3-2-g0d8e


From 3451ca8beeb58a3bdd864cd1009ba9f0e314b442 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 5 Jul 2017 17:27:57 -0400
Subject: add XFCE.networkManager

---
 joeyconfig.hs                  | 3 ++-
 src/Propellor/Property/XFCE.hs | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/joeyconfig.hs b/joeyconfig.hs
index 37b8fafb..1be4ff14 100644
--- a/joeyconfig.hs
+++ b/joeyconfig.hs
@@ -118,9 +118,10 @@ demo = host "demo" $ props
 	& root `User.hasInsecurePassword` "debian"
 	& user `User.hasInsecurePassword` "debian"
 	& XFCE.installedMin
+	& XFCE.networkManager
 	& XFCE.defaultPanelFor user File.OverwriteExisting
 	& LightDM.autoLogin user
-	& Apt.installed ["network-manager", "network-manager-gnome", "firefox"]
+	& Apt.installed ["firefox"]
   where
 	user = User "user"
 	root = User "root"
diff --git a/src/Propellor/Property/XFCE.hs b/src/Propellor/Property/XFCE.hs
index 6241326e..dc57660f 100644
--- a/src/Propellor/Property/XFCE.hs
+++ b/src/Propellor/Property/XFCE.hs
@@ -10,11 +10,16 @@ installed = Apt.installed ["task-xfce-desktop"]
 	`describe` "XFCE desktop installed"
 
 -- | Minimal install of XFCE, with a terminal emulator and panel,
--- and X, but not any of the extras.
+-- and X and network-manager, but not any of the extra apps.
 installedMin :: Property DebianLike
 installedMin = Apt.installedMin ["xfce4", "xfce4-terminal", "task-desktop"]
 	`describe` "minimal XFCE desktop installed"
 
+-- | Installs network-manager-gnome, which is the way to get
+-- network-manager to manage networking in XFCE too.
+networkManager :: Property DebianLike
+networkManager = Apt.installedMin ["network-manager-gnome"]
+
 -- | Normally at first login, XFCE asks what kind of panel the user wants.
 -- This enables the default configuration noninteractively.
 defaultPanelFor :: User -> File.Overwrite -> Property DebianLike
-- 
cgit v1.3-2-g0d8e