summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Propellor/Property/Mount.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Mount.hs b/src/Propellor/Property/Mount.hs
index e8f3f092..71f1733e 100644
--- a/src/Propellor/Property/Mount.hs
+++ b/src/Propellor/Property/Mount.hs
@@ -151,4 +151,4 @@ unmountBelow d = do
submnts <- mountPointsBelow d
-- sort so sub-mounts are unmounted before the mount point
-- containing them
- forM_ (sort submnts) umountLazy
+ forM_ (reverse (sort submnts)) umountLazy
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 6965af76..a4357101 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -646,7 +646,7 @@ dkimInstalled = go `onChange` Service.restarted "opendkim"
& Apt.serviceInstalledRunning "opendkim"
& File.dirExists "/etc/mail"
& File.hasPrivContent "/etc/mail/dkim.key" (Context "kitenet.net")
- & File.ownerGroup "/etc/mail/dkim.key" (User "opendkim") (Group "opendkim")
+ & File.ownerGroup "/etc/mail/dkim.key" (User "root") (Group "root")
& "/etc/default/opendkim" `File.containsLine`
"SOCKET=\"inet:8891@localhost\""
`onChange`