From 762ae8585a094ff8163653854adc992fcb00ce66 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Fri, 22 May 2015 12:26:42 -0400 Subject: [PATCH 1/7] fix carbon-cache retention for IABak --- src/Propellor/Property/SiteSpecific/IABak.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index fc56de8..86229e1 100644 --- a/src/Propellor/Property/SiteSpecific/IABak.hs +++ b/src/Propellor/Property/SiteSpecific/IABak.hs @@ -65,7 +65,7 @@ graphiteServer = propertyList "iabak graphite server" $ props , "retentions = 60:90d" , "[iabak]" , "pattern = ^iabak\\." - , "retentions = 10m:30d,1h:1y,3h,10y" + , "retentions = 10m:30d,1h:1y,3h:10y" , "[default_1min_for_1day]" , "pattern = .*" , "retentions = 60s:1d" From 65b511e2d4f4ec9864167e414e76b967eda32dba Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Fri, 22 May 2015 12:27:38 -0400 Subject: [PATCH 2/7] shorten retention for IABak connections stat should have committed this ages ago :( --- src/Propellor/Property/SiteSpecific/IABak.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index 86229e1..4ddc638 100644 --- a/src/Propellor/Property/SiteSpecific/IABak.hs +++ b/src/Propellor/Property/SiteSpecific/IABak.hs @@ -63,6 +63,9 @@ graphiteServer = propertyList "iabak graphite server" $ props [ "[carbon]" , "pattern = ^carbon\\." , "retentions = 60:90d" + , "[iabak-connections]" + , "pattern = ^iabak\.shardstats\.connections" + , "retentions = 1h:1y,3h:10y" , "[iabak]" , "pattern = ^iabak\\." , "retentions = 10m:30d,1h:1y,3h:10y" From b7a9655a695103b3ca2e4e6edfe305f9b44d9250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Sipma?= Date: Fri, 31 Jul 2015 12:34:25 +0200 Subject: [PATCH 3/7] Propellor.Property.Tor: remove duplicate code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Félix Sipma --- src/Propellor/Property/Tor.hs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs index 3af4a70..f1aaeeb 100644 --- a/src/Propellor/Property/Tor.hs +++ b/src/Propellor/Property/Tor.hs @@ -103,13 +103,8 @@ bandwidthRate' s divby = case readSize dataUnits s of Nothing -> property ("unable to parse " ++ s) noChange hiddenServiceAvailable :: HiddenServiceName -> Int -> Property NoInfo -hiddenServiceAvailable hn port = hiddenServiceHostName prop +hiddenServiceAvailable hn port = hiddenServiceHostName $ hiddenService hn port where - prop = configured - [ ("HiddenServiceDir", varLib hn) - , ("HiddenServicePort", unwords [show port, "127.0.0.1:" ++ show port]) - ] - `describe` "hidden service available" hiddenServiceHostName p = adjustPropertySatisfy p $ \satisfy -> do r <- satisfy h <- liftIO $ readFile (varLib hn "hostname") @@ -164,7 +159,7 @@ type NickName = String -- | Convert String to a valid tor NickName. saneNickname :: String -> NickName -saneNickname s +saneNickname s | null n = "unnamed" | otherwise = n where From 3a170b52b711bd0d8dfec2538e609cdfbfa11f38 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Sun, 2 Aug 2015 03:59:28 -0400 Subject: [PATCH 4/7] re-add mistakenly removed retention line to the graphite schema config file --- src/Propellor/Property/SiteSpecific/IABak.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index 8ed3b38..7740f82 100644 --- a/src/Propellor/Property/SiteSpecific/IABak.hs +++ b/src/Propellor/Property/SiteSpecific/IABak.hs @@ -71,6 +71,7 @@ graphiteServer = propertyList "iabak graphite server" $ props , "retentions = 10m:30d,1h:1y,3h:10y" , "[default_1min_for_1day]" , "pattern = .*" + , "retentions = 60s:1d" ] & graphiteCSRF & cmdProperty "graphite-manage" ["syncdb", "--noinput"] `flagFile` "/etc/flagFiles/graphite-syncdb" From 3b938727828aaf420f064185d5064c6c61599905 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Aug 2015 09:45:05 -0400 Subject: [PATCH 5/7] spin From 17e0471b2fb93898f7773992b0406524f5d9c220 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Aug 2015 13:42:05 -0400 Subject: [PATCH 6/7] propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 7f89343..5ccd999 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -132,6 +132,7 @@ androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container androidAutoBuilderContainer crontimes timeout = androidContainer "android-git-annex-builder" (tree "android") builddir & Apt.unattendedUpgrades + & buildDepsNoHaskellLibs & autobuilder "android" crontimes timeout -- Android is cross-built in a Debian i386 container, using the Android NDK. From b64a91db5767e2afcd53f496ba303ada8e3fdcc1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Aug 2015 13:42:40 -0400 Subject: [PATCH 7/7] propellor spin