From 21bc92daf712649a0a62c3f666e40b82f22b76a2 Mon Sep 17 00:00:00 2001 From: Tim van Oostrom Date: Mon, 4 Dec 2023 08:08:14 +0100 Subject: [PATCH] Mijn-7136 setup acc subs (#84) --- app/config.py | 2 +- azure-pipelines.yaml | 2 -- conf/docker-entrypoint.sh | 7 +++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/config.py b/app/config.py index a1719a2..abfc2e1 100644 --- a/app/config.py +++ b/app/config.py @@ -34,7 +34,7 @@ SERVER_CLIENT_KEY = os.getenv("MIJN_DATA_CLIENT_KEY") # TODO: Add other AZ env conditions after migration. -if IS_TEST: +if IS_TAP and SERVER_CLIENT_CERT is not None: # https://stackoverflow.com/a/46570364/756075 # Server security / certificates cert = tempfile.NamedTemporaryFile(delete=False) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 85a3007..94454b3 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -52,8 +52,6 @@ variables: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - name: btdDeploy value: ${{ parameters.btdDeploy }} - - name: dtapName - value: t - ${{ if ne(parameters.dtapName, 'none') }}: - name: dtapName value: ${{ parameters.dtapName }} diff --git a/conf/docker-entrypoint.sh b/conf/docker-entrypoint.sh index 549dd97..eb0e5d5 100644 --- a/conf/docker-entrypoint.sh +++ b/conf/docker-entrypoint.sh @@ -2,10 +2,9 @@ set -e # AZ AppService allows SSH into a App instance. -if [ $MA_OTAP_ENV == "test" ] -then - # echo "Starting SSH ..." -service ssh start +if [ "$MA_OTAP_ENV" = "test" ]; then + echo "Starting SSH ..." + service ssh start fi uwsgi --uid www-data --gid www-data --ini /api/uwsgi.ini \ No newline at end of file