summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs2
-rw-r--r--src/Propellor/Property/SiteSpecific/JoeySites.hs5
2 files changed, 4 insertions, 3 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 479bb221..98cb195a 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -80,7 +80,7 @@ darkstar = host "darkstar.kitenet.net"
& JoeySites.postfixClientRelay (Context "darkstar.kitenet.net")
& JoeySites.dkimMilter
- & alarmClock "*-*-* 7:30" (User "joey")
+ & JoeySites.alarmClock "*-*-* 7:30" (User "joey")
"/usr/bin/timeout 45m /home/joey/bin/goodmorning"
& imageBuilt "/tmp/img" c MSDOS (grubBooted PC)
diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs
index f428d382..d22eb615 100644
--- a/src/Propellor/Property/SiteSpecific/JoeySites.hs
+++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs
@@ -6,6 +6,7 @@ module Propellor.Property.SiteSpecific.JoeySites where
import Propellor.Base
import qualified Propellor.Property.Apt as Apt
import qualified Propellor.Property.File as File
+import qualified Propellor.Property.ConfFile as ConfFile
import qualified Propellor.Property.Gpg as Gpg
import qualified Propellor.Property.Ssh as Ssh
import qualified Propellor.Property.Git as Git
@@ -961,11 +962,11 @@ alarmClock oncalendar (User user) command = combineProperties
, ""
, "[Service]"
, "Type=oneshot"
- , "ExecStart=/bin/systemd-inhibit --what=handle-lid-switch --why=goodmorning /bin/su " ++ user ++ " -c \"" ++ program ++ "\""
+ , "ExecStart=/bin/systemd-inhibit --what=handle-lid-switch --why=goodmorning /bin/su " ++ user ++ " -c \"" ++ command ++ "\""
]
`onChange` Systemd.daemonReloaded
, Systemd.enabled "goodmorning.timer"
, Systemd.started "goodmorning.timer"
- , "/etc/systemd/logind.conf" `File.containsConfPair`
+ , "/etc/systemd/logind.conf" `ConfFile.containsIniSetting`
("Login", "LidSwitchIgnoreInhibited", "no")
]