Revert oidc configs for images and doi

AtlasOfLivingAustralia · Jul 12, 2022 · 19ab3d2 · 19ab3d2
1 parent cf5948f
commit 19ab3d2
Show file tree

Hide file tree

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