Skip to content
This repository was archived by the owner on Feb 13, 2023. It is now read-only.

Commit c091ff8

Browse files
committed
Bump Solr role version to mitigate CVE-2021-44228.
1 parent 82ec7b7 commit c091ff8

File tree

5 files changed

+12
-3
lines changed

5 files changed

+12
-3
lines changed

provisioning/requirements.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ roles:
7777
- name: geerlingguy.security
7878
version: 2.0.1
7979
- name: geerlingguy.solr
80-
version: 5.2.0
80+
version: 5.3.0
8181
- name: geerlingguy.varnish
8282
version: 3.3.0

provisioning/roles/geerlingguy.solr/.github/stale.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ onlyLabels: []
1212

1313
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
1414
exemptLabels:
15+
- bug
1516
- pinned
1617
- security
1718
- planned

provisioning/roles/geerlingguy.solr/README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Files will be downloaded to this path on the remote server before being moved in
2424

2525
Solr will be run under the `solr_user`. Set `solr_create_user` to `false` if `solr_user` is created before this role runs, or if you're using Solr 5+ and want Solr's own installation script to set up the user. By default, `solr_group` equals `solr_user`, but it can be overwritten to fit your own configuration.
2626

27-
solr_version: "8.6.0"
27+
solr_version: "8.11.0"
2828

2929
The Apache Solr version to install. For a full list, see [available Apache Solr versions](http://archive.apache.org/dist/lucene/solr/).
3030

@@ -64,6 +64,10 @@ Memory settings for the JVM. These should be set as high as you can allow for be
6464

6565
Default timezone of JVM running solr. You can override this if needed when using dataimport and delta imports (ex: comparing against a MySQL external data source). Read through Apache Solr's [Working with Dates](https://cwiki.apache.org/confluence/display/solr/Working+with+Dates) documentation for more background.
6666

67+
solr_opts: "$SOLR_OPTS -Dlog4j2.formatMsgNoLookups=true"
68+
69+
Solr options. This option was added to the role in part to mitigate [CVE-2021-44228](https://solr.apache.org/security.html#apache-solr-affected-by-apache-log4j-cve-2021-44228).
70+
6771
solr_cores:
6872
- collection1
6973

provisioning/roles/geerlingguy.solr/defaults/main.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ solr_create_user: true
55
solr_user: solr
66
solr_group: "{{ solr_user }}"
77

8-
solr_version: "8.6.0"
8+
solr_version: "8.11.0"
99
solr_mirror: "https://archive.apache.org/dist"
1010
solr_remove_cruft: false
1111

@@ -24,6 +24,8 @@ solr_xmx: "512M"
2424

2525
solr_timezone: "UTC"
2626

27+
solr_opts: "$SOLR_OPTS -Dlog4j2.formatMsgNoLookups=true"
28+
2729
solr_cores:
2830
- collection1
2931

provisioning/roles/geerlingguy.solr/tasks/configure.yml

+2
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,6 @@
2020
line: 'SOLR_PORT="{{ solr_port }}"'
2121
- regexp: "^.?SOLR_TIMEZONE="
2222
line: 'SOLR_TIMEZONE="{{ solr_timezone }}"'
23+
- regexp: "^.?SOLR_OPTS="
24+
line: 'SOLR_OPTS="{{ solr_opts }}"'
2325
notify: restart solr

0 commit comments

Comments
 (0)