From 9f4b3e0ed4de04ba5fb754ea45402465faf30783 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Sep 2015 15:05:50 -0400 Subject: aiccu's init script doesn't support reload; restart it --- src/Propellor/Property/Aiccu.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Propellor/Property/Aiccu.hs') diff --git a/src/Propellor/Property/Aiccu.hs b/src/Propellor/Property/Aiccu.hs index 519b8ce9..e8aaa7bb 100644 --- a/src/Propellor/Property/Aiccu.hs +++ b/src/Propellor/Property/Aiccu.hs @@ -1,6 +1,6 @@ module Propellor.Property.Aiccu ( installed, - reloaded, + restarted, confPath, UserName, TunnelId, @@ -15,8 +15,8 @@ import qualified Propellor.Property.File as File installed :: Property NoInfo installed = Apt.installed ["aiccu"] -reloaded :: Property NoInfo -reloaded = Service.reloaded "aiccu" +restarted :: Property NoInfo +restarted = Service.restarted "aiccu" confPath :: FilePath confPath = "/etc/aiccu.conf" @@ -28,7 +28,7 @@ config u t p = [ "protocol tic" , "server tic.sixxs.net" , "username " ++ u - , "password " ++ (privDataVal p) + , "password " ++ privDataVal p , "ipv6_interface sixxs" , "tunnel_id " ++ t , "daemonize true" @@ -40,7 +40,7 @@ config u t p = -- | Configures an ipv6 tunnel using sixxs.net, with the given TunneId -- and sixx.net UserName. hasConfig :: TunnelId -> UserName -> Property HasInfo -hasConfig t u = prop `onChange` reloaded +hasConfig t u = prop `onChange` restarted where prop = withSomePrivData [(Password (u++"/"++t)), (Password u)] (Context "aiccu") $ property "aiccu configured" . writeConfig -- cgit v1.2.3