Merge branch 'main' into MIJN-6678-move-to-post

Amsterdam · Dec 4, 2023 · 09e79e4 · 09e79e4
2 parents 9d2446e + 21bc92d
commit 09e79e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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