From 1d3c27868277c28350dfb087802bc1f7c6732aeb Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Fri, 2 Sep 2022 11:38:03 +0200 Subject: [PATCH] fix(avs): incomplete config throws error --- db.sh | 1 + src/Application.hs | 7 ++++--- start.sh | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/db.sh b/db.sh index a585ee1f6..7c154686d 100755 --- a/db.sh +++ b/db.sh @@ -13,4 +13,5 @@ fi stack build --fast --flag uniworx:-library-only --flag uniworx:dev export SERVER_SESSION_ACID_FALLBACK=${SERVER_SESSION_ACID_FALLBACK:-true} +export AVSPASS=${AVSPASS:-nopasswordset} stack exec uniworxdb -- $@ diff --git a/src/Application.hs b/src/Application.hs index 72ebe38a2..475f04ec6 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -348,9 +348,10 @@ makeFoundation appSettings''@AppSettings{..} = do appAvsQuery <- case appAvsConf of Nothing -> do - $logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings." - return Nothing - -- liftIO exitFailure + -- $logErrorS "avsPrepare" "appAvsConfig is empty, i.e. invalid AVS configuration settings." + -- return Nothing + error "AvsConfig is empty, i.e. invalid AVS configuration settings." + Just avsConf -> do -- TODO: consider using Servant.Client.Core.BaseUrl.Instances.parseBaseUrl' within Settings already at Startup! manager <- newManagerSettings $ mkManagerSettings (def { settingDisableCertificateValidation = True }) Nothing diff --git a/start.sh b/start.sh index 9eea5843b..a663c3ef7 100755 --- a/start.sh +++ b/start.sh @@ -22,6 +22,7 @@ export ALLOW_DEPRECATED=${ALLOW_DEPRECATED:-true} export ENCRYPT_ERRORS=${ENCRYPT_ERRORS:-false} export RIBBON=${RIBBON:-${__HOST:-localhost}} export APPROOT=${APPROOT:-http://localhost:$((${PORT_OFFSET:-0} + 3000))} +export AVSPASS=${AVSPASS:-nopasswordset} unset HOST move-back() {