From b7a9655a695103b3ca2e4e6edfe305f9b44d9250 Mon Sep 17 00:00:00 2001 From: Félix Sipma Date: Fri, 31 Jul 2015 12:34:25 +0200 Subject: Propellor.Property.Tor: remove duplicate code Signed-off-by: Félix Sipma --- src/Propellor/Property/Tor.hs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/Propellor/Property/Tor.hs b/src/Propellor/Property/Tor.hs index 3af4a70c..f1aaeeb1 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 -- cgit v1.2.3 From 3a170b52b711bd0d8dfec2538e609cdfbfa11f38 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Sun, 2 Aug 2015 03:59:28 -0400 Subject: re-add mistakenly removed retention line to the graphite schema config file --- src/Propellor/Property/SiteSpecific/IABak.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/IABak.hs b/src/Propellor/Property/SiteSpecific/IABak.hs index 8ed3b38f..7740f820 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" -- cgit v1.2.3 From 17e0471b2fb93898f7773992b0406524f5d9c220 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 3 Aug 2015 13:42:05 -0400 Subject: propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 7f893431..5ccd9996 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. -- cgit v1.2.3