Merge branch 'joeyconfig'
This commit is contained in:
commit
497397274d
|
@ -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.
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in New Issue