From 66060f45f7b448af14f0ed0be26f1bc7b7f422c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Jan 2016 15:32:33 -0400 Subject: [PATCH] Revert "Add Munin module." This reverts commit f09df3e2264fa404964495f08455e975c97f742a. Wow, applied to wrong project entirely. --- src/Propellor/Property/Munin.hs | 57 --------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 src/Propellor/Property/Munin.hs diff --git a/src/Propellor/Property/Munin.hs b/src/Propellor/Property/Munin.hs deleted file mode 100644 index 43112a6c6c..0000000000 --- a/src/Propellor/Property/Munin.hs +++ /dev/null @@ -1,57 +0,0 @@ --- | Maintainer: Jelmer Vernooij --- -module Propellor.Property.Munin ( - hostListFragment, - hostListFragment', - nodePort, - nodeInstalled, - nodeRestarted, - nodeConfPath, - masterInstalled, - masterRestarted, - masterConfPath, -) where - -import Propellor -import qualified Propellor.Property.Apt as Apt -import qualified Propellor.Property.Service as Service - -nodePort :: Integer -nodePort = 4949 - -nodeInstalled :: Property NoInfo -nodeInstalled = Apt.serviceInstalledRunning "munin-node" - -nodeRestarted :: Property NoInfo -nodeRestarted = Service.restarted "munin-node" - -nodeConfPath :: FilePath -nodeConfPath = "/etc/munin/munin-node.conf" - -masterInstalled :: Property NoInfo -masterInstalled = Apt.serviceInstalledRunning "munin" - -masterRestarted :: Property NoInfo -masterRestarted = Service.restarted "munin" - -masterConfPath :: FilePath -masterConfPath = "/etc/munin/munin.conf" - - --- | Create the host list fragment for master config. --- Takes an optional override list for hosts that are accessible on a non-standard host/port. --- TODO(jelmer): Only do this on hosts where munin is present (in other words, with Munin.installedNode) -hostListFragment' :: [Host] -> [(HostName, (IPAddr, Port))] -> [String] -hostListFragment' hs os = concatMap muninHost hs - where - muninHost :: Host -> [String] - muninHost h = [ "[" ++ (hostName h) ++ "]" - , " address " ++ maybe (hostName h) (fromIPAddr . fst) (hOverride h) - ] ++ (maybe [] (\x -> [" port " ++ (show $ fromPort $ snd x)]) (hOverride h)) ++ [""] - hOverride :: Host -> Maybe (IPAddr, Port) - hOverride h = lookup (hostName h) os - fromPort (Port p) = p - --- | Create the host list fragment for master config. -hostListFragment :: [Host] -> [String] -hostListFragment hs = hostListFragment' hs []