Skip to content

Commit

Permalink
#243 committing in order to merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Don Sizemore committed Dec 14, 2023
2 parents 50ff4e4 + 8f755de commit 2ecac8f
Show file tree
Hide file tree
Showing 6 changed files with 408 additions and 14 deletions.
16 changes: 8 additions & 8 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,9 @@ dataverse:
launch_timeout: 180
request_timeout: 1800
root: /usr/local
dir: payara5
zipurl: https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/5.2022.3/payara-5.2022.3.zip
zipchecksum: sha256:4088221274882de792fda0836ddd47f0550f896e44c62174579c2c70a1177a5d
dir: payara6
zipurl: https://nexus.payara.fish/repository/payara-community/fish/payara/distributions/payara/6.2023.8/payara-6.2023.8.zip
zipchecksum: sha256:108ed0fa7f97bb3833ff00610a4951dd41389e2647dffe28132ad54231af694a
google_analytics_key:
jacoco:
enabled: false
Expand Down Expand Up @@ -244,20 +244,20 @@ dataverse:
service_email: [email protected]
smtp: localhost # or the FQDN of your organization's SMTP relay
solr:
download_url: https://dlcdn.apache.org/solr/solr/9.3.0/solr-9.3.0.tgz
group: solr
root: /usr/local/solr
user: solr
version: 8.11.1
# download_url: # override the default download URL
checksum: sha256:9ec540cbd8e45f3d15a6b615a22939f5e6242ca81099951a47d3c082c79866a9
version: 9.3.0
listen: 127.0.0.1
checksum: sha256:2a924a776d7c06dea561f12bdb17291dbaecc9e9a06f363d4599acb7fb7bfa71
srcdir: /tmp/dataverse
thumbnails: false
unittests:
enabled: false
argument: '-DcompilerArgument=-Xlint:unchecked test -P all-unit-tests'
usermgmtkey: burrito
version: '5.14'
version: '6.0'
# robots_txt_url: https://guides.dataverse.org/en/latest/_downloads/3a5cd7a283eecd5e93289e30af713554/robots.txt

build_guides: false
Expand Down Expand Up @@ -299,7 +299,7 @@ grafana:
grafana_password: 'adm1n'

java:
version: 11
version: 17
home: /usr/lib/jvm/java-{{ java.version}}

localstack:
Expand Down
8 changes: 8 additions & 0 deletions tasks/postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,13 @@
role_attr_flags: 'NOSUPERUSER,CREATEDB,CREATEROLE,INHERIT,LOGIN'
when: db.use_rds == false

- name: postgresql 15 requires explicit permissions on public schema
community.postgresql.postgresql_privs:
db: '{{ db.postgres.name }}'
privs: CREATE
type: schema
objs: public
role: '{{ db.postgres.user }}'

- ansible.builtin.import_tasks: postgres_sequential_identifiers.yml
when: dataverse.api.test_suite == true
2 changes: 1 addition & 1 deletion tasks/solr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

- name: Set default solr download url
set_fact:
solr_download_url: "https://archive.apache.org/dist/lucene/solr/{{ dataverse.solr.version }}/solr-{{ dataverse.solr.version }}.tgz"
solr_download_url: "https://archive.apache.org/dist/solr/solr/{{ dataverse.solr.version }}/solr-{{ dataverse.solr.version }}.tgz"
when: dataverse.solr.download_url is not defined

- name: Set custom solr download url
Expand Down
2 changes: 1 addition & 1 deletion tests/group_vars/jenkins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ dataverse:
enabled: true
argument: '-DcompilerArgument=-Xlint:unchecked test -P all-unit-tests'
usermgmtkey: burrito
version: '5.14'
version: '6.0'

build_guides: false

Expand Down
Loading

0 comments on commit 2ecac8f

Please sign in to comment.