From 776c11f6a9187da03324b879e744a8f07b480a09 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 24 Nov 2015 09:58:45 -0400 Subject: fixes --- src/Propellor/Property/SiteSpecific/JoeySites.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Propellor/Property/SiteSpecific') 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") ] -- cgit v1.2.3