Mijn-7276 cert loading (#60)

Amsterdam · Dec 4, 2023 · 31da235 · 31da235
1 parent 87c00c1
commit 31da235
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/app/config.py b/app/config.py
@@ -80,11 +80,12 @@
     "": ["AO2", "AO5", "DBS", "KVB", "WMH", "AAN", "FIE"],
 }
 
+# Server security / certificates for ZorgNed
 SERVER_CLIENT_CERT = os.getenv("MIJN_DATA_CLIENT_CERT")
 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