From a4cacd6991a5e0db0dfbb5ea029c439cd96b6107 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Fri, 22 Dec 2023 18:49:15 +0200 Subject: [PATCH] Enable overriding S3 endpoint with AWS_S3_ENDPOINT --- src/Stackage/Database/Cron.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Stackage/Database/Cron.hs b/src/Stackage/Database/Cron.hs index d966618..fafbd8a 100644 --- a/src/Stackage/Database/Cron.hs +++ b/src/Stackage/Database/Cron.hs @@ -59,6 +59,7 @@ import Stackage.Database.PackageInfo import Stackage.Database.Query import Stackage.Database.Schema import Stackage.Database.Types +import System.Environment (getEnvironment) import UnliftIO.Concurrent (getNumCapabilities) import Web.PathPieces (fromPathPiece, toPathPiece) import qualified Control.Retry as Retry @@ -163,7 +164,12 @@ stackageServerCron StackageCronOptions {..} = do cabalMutable <- newIORef Map.empty gpdCache <- newIORef IntMap.empty defaultProcessContext <- mkDefaultProcessContext - aws <- newEnv Discover + aws <- do + aws' <- newEnv Discover + endpoint <- lookup "AWS_S3_ENDPOINT" <$> getEnvironment + pure $ case endpoint of + Nothing -> aws' + Just ep -> configure (setEndpoint True (BS8.pack ep) 443 s3) aws' withLogFunc (setLogMinLevel scoLogLevel lo) $ \logFunc -> do let pantryConfig = PantryConfig