summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Fstab.hs3
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Propellor/Property/Fstab.hs b/src/Propellor/Property/Fstab.hs
index 29b85426..53ed4fba 100644
--- a/src/Propellor/Property/Fstab.hs
+++ b/src/Propellor/Property/Fstab.hs
@@ -26,7 +26,8 @@ import Utility.Table
mounted :: FsType -> Source -> MountPoint -> MountOpts -> Property Linux
mounted fs src mnt opts = tightenTargets $
listed fs src mnt opts
- `onChange` mountnow
+ `before` mountnow
+ `requires` File.dirExists mnt
where
-- This use of mountPoints, which is linux-only, is why this
-- property currently only supports linux.
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index 3076cbfd..7812c855 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -912,7 +912,7 @@ alarmClock oncalendar (User user) command = combineProperties "goodmorning timer
homePowerMonitor :: IsContext c => User -> c -> (SshKeyType, Ssh.PubKeyText) -> Property (HasInfo + DebianLike)
homePowerMonitor user ctx sshkey = propertyList "home power monitor" $ props
& Apache.installed
- & Apt.installed ["python2", "python-pymodbus"]
+ & Apt.installed ["python", "python-pymodbus"]
& File.ownerGroup "/var/www/html" user (userGroup user)
& Git.cloned user "git://git.kitenet.net/joey/homepower" d Nothing
`onChange` buildpoller