Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mijn-7276 cert loading #60

Merged
merged 4 commits into from
Dec 4, 2023
+5 −7
Merged

Mijn-7276 cert loading #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e309c19
Change condition
timvanoostrom Nov 28, 2023
f607043
Remove assignment
timvanoostrom Nov 28, 2023
e31830a
Change to posix
timvanoostrom Nov 28, 2023
661ce7e
Merge branch 'main' into MIJN-7276-cert-loading
timvanoostrom Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
7 changes: 3 additions & 4 deletions conf/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading