cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-08-03 15:16:59 -04:00
parent 76c9e82fd6 b64a91db57
commit 497397274d
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -132,6 +132,7 @@ androidAutoBuilderContainer :: Times -> TimeOut -> Systemd.Container
androidAutoBuilderContainer crontimes timeout = androidAutoBuilderContainer crontimes timeout =
androidContainer "android-git-annex-builder" (tree "android") builddir androidContainer "android-git-annex-builder" (tree "android") builddir
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& buildDepsNoHaskellLibs
& autobuilder "android" crontimes timeout & autobuilder "android" crontimes timeout
-- Android is cross-built in a Debian i386 container, using the Android NDK. -- Android is cross-built in a Debian i386 container, using the Android NDK.

1
src/Propellor/Property/SiteSpecific/IABak.hs
View File

@ -71,6 +71,7 @@ graphiteServer = propertyList "iabak graphite server" $ props
, "retentions = 10m:30d,1h:1y,3h:10y" , "retentions = 10m:30d,1h:1y,3h:10y"
, "[default_1min_for_1day]" , "[default_1min_for_1day]"
, "pattern = .*" , "pattern = .*"
, "retentions = 60s:1d"
] ]
& graphiteCSRF & graphiteCSRF
& cmdProperty "graphite-manage" ["syncdb", "--noinput"] `flagFile` "/etc/flagFiles/graphite-syncdb" & cmdProperty "graphite-manage" ["syncdb", "--noinput"] `flagFile` "/etc/flagFiles/graphite-syncdb"

9
src/Propellor/Property/Tor.hs
View File

@ -103,13 +103,8 @@ bandwidthRate' s divby = case readSize dataUnits s of
Nothing -> property ("unable to parse " ++ s) noChange Nothing -> property ("unable to parse " ++ s) noChange
hiddenServiceAvailable :: HiddenServiceName -> Int -> Property NoInfo hiddenServiceAvailable :: HiddenServiceName -> Int -> Property NoInfo
hiddenServiceAvailable hn port = hiddenServiceHostName prop hiddenServiceAvailable hn port = hiddenServiceHostName $ hiddenService hn port
where 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 hiddenServiceHostName p = adjustPropertySatisfy p $ \satisfy -> do
r <- satisfy r <- satisfy
h <- liftIO $ readFile (varLib </> hn </> "hostname") h <- liftIO $ readFile (varLib </> hn </> "hostname")
@ -164,7 +159,7 @@ type NickName = String
-- | Convert String to a valid tor NickName. -- | Convert String to a valid tor NickName.
saneNickname :: String -> NickName saneNickname :: String -> NickName
saneNickname s saneNickname s
| null n = "unnamed" | null n = "unnamed"
| otherwise = n | otherwise = n
where where