From 19ab3d2be5f6192dee1157aa0df4c43df80bb2ce Mon Sep 17 00:00:00 2001 From: yasima-csiro Date: Wed, 13 Jul 2022 08:17:02 +1000 Subject: [PATCH] Revert oidc configs for images and doi --- ansible/doi-service-standalone.yml | 2 +- ansible/roles/doi-service/vars/main.yml | 2 +- ansible/roles/image-service/vars/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/doi-service-standalone.yml b/ansible/doi-service-standalone.yml index d19a43780..37af32b4a 100644 --- a/ansible/doi-service-standalone.yml +++ b/ansible/doi-service-standalone.yml @@ -4,7 +4,7 @@ - java - postfix - {role: db-backup, db: postgres, db_name: "{{ doi_db_name }}", db_user: "{{ doi_db_user }}", db_password: "{{ doi_db_password }}" } - - {role: postgresql, pg_version: "14"} + - {role: postgresql, pg_version: "9.6"} - {role: pg_instance, extensions: ["citext", "pgcrypto"], db_name: "{{ doi_db_name }}", db_user: "{{ doi_db_user }}", db_password: "{{ doi_db_password }}" } - {role: ansible-elasticsearch, es_templates: false, es_instance_name: 'doi-elasticsearch', es_data_dirs: ['/data/elasticsearch'], tags: ['elasticsearch']} - webserver diff --git a/ansible/roles/doi-service/vars/main.yml b/ansible/roles/doi-service/vars/main.yml index 809aca7fe..1a6442bf5 100644 --- a/ansible/roles/doi-service/vars/main.yml +++ b/ansible/roles/doi-service/vars/main.yml @@ -3,5 +3,5 @@ version: "{{ doi_service_version | default('LATEST') }}" artifactId: "doi-service" classifier: 'exec' groupId: "au.org.ala" -packaging: "war" +packaging: "jar" doi_service_jar_url: "{{maven_repo_ws_url}}" diff --git a/ansible/roles/image-service/vars/main.yml b/ansible/roles/image-service/vars/main.yml index 1e6daefec..c8655c1d7 100644 --- a/ansible/roles/image-service/vars/main.yml +++ b/ansible/roles/image-service/vars/main.yml @@ -3,5 +3,5 @@ artifactId: "image-service" image_service_url: "{{maven_repo_ws_url}}" classifier: 'exec' groupId: "au.org.ala" -packaging: "war" +packaging: "jar" image_service_jar_url: "{{maven_repo_ws_url}}"