summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Aiccu.hs
diff options
context:
space:
mode:
authorJoey Hess2015-09-20 15:05:50 -0400
committerJoey Hess2015-09-20 15:07:47 -0400
commit9f4b3e0ed4de04ba5fb754ea45402465faf30783 (patch)
tree0d875d2a30976da9b125185679564a418616ef8b /src/Propellor/Property/Aiccu.hs
parent7037f687af946dccf457eff08119ba58cd16ac2d (diff)
aiccu's init script doesn't support reload; restart it
Diffstat (limited to 'src/Propellor/Property/Aiccu.hs')
-rw-r--r--src/Propellor/Property/Aiccu.hs10
1 files changed, 5 insertions, 5 deletions
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