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

Back merge Release/20201210 #2541

Merged
merged 2 commits into from
Dec 10, 2020
Merged

Back merge Release/20201210 #2541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6cc3f8
Change http to https and set default for datagov_in_service
chris-macdermaid Dec 9, 2020
536076f
Update for synk vulnerability
chris-macdermaid Dec 9, 2020
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
6 changes: 6 additions & 0 deletions .snyk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,10 @@ ignore:
operators. These operators should only be using trusted sources as
well. Risk is acceptable.
expires: 2020-12-19T06:00:00.000Z
SNYK-PYTHON-PY-1049546:
- '*':
reason: >-
There is no fix for Py at this time. This is introduced through molecule
and molecule is only used in dev environments.
expires: 2021-03-10T06:00:00.000Z
patch: {}
6 changes: 3 additions & 3 deletions ansible/catalog-web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

- name: assert catalog is up
uri:
url: http://{{ ansible_fqdn }}/api/action/status_show
url: https://{{ ansible_fqdn }}/api/action/status_show
follow_redirects: none
status_code: 200
# TODO enable cert validation. Staging and production hosts have GSA
Expand Down Expand Up @@ -102,7 +102,7 @@
- smoke
when:
- catalog_ckan_readwrite_configuration == 'readonly'
- datagov_in_service
- datagov_in_service | default(true)

- name: check /_tracking redirection with data
block:
Expand All @@ -129,7 +129,7 @@
- smoke
when:
- catalog_ckan_readwrite_configuration == 'readonly'
- datagov_in_service
- datagov_in_service | default(true)


- name: logrotate configuration
Expand Down
2 changes: 1 addition & 1 deletion ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

- name: assert app is up
uri:
url: http://{{ ansible_fqdn }}/api/action/status_show
url: https://{{ ansible_fqdn }}/api/action/status_show
follow_redirects: none
status_code: 200
# TODO enable cert validation. Staging and production hosts have GSA
Expand Down
4 changes: 2 additions & 2 deletions ansible/pycsw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

- name: assert csw-collection is up
uri:
url: http://{{ ansible_fqdn }}/csw?service=CSW&version=2.0.2&request=GetCapabilities
url: https://{{ ansible_fqdn }}/csw?service=CSW&version=2.0.2&request=GetCapabilities
follow_redirects: none
status_code: 200
return_content: true
Expand All @@ -45,7 +45,7 @@

- name: assert csw-all is up
uri:
url: http://{{ ansible_fqdn }}/csw-all?service=CSW&version=2.0.2&request=GetCapabilities
url: https://{{ ansible_fqdn }}/csw-all?service=CSW&version=2.0.2&request=GetCapabilities
follow_redirects: none
status_code: 200
return_content: true
Expand Down