Skip to content

Commit

Permalink
!!![TASK] Upgrade to Apache Solr 9.3.0
Browse files Browse the repository at this point in the history
Note this change requires on third party installations enabling stream feature via the ENV vars or system properties.

Following variables are set in Docker images:
* `SOLR_ENABLE_REMOTE_STREAMING=true`
* `SOLR_ENABLE_STREAM_BODY=true`

For more information see:
* https://solr.apache.org/guide/solr/latest/upgrade-notes/major-changes-in-solr-9.html#security
* https://issues.apache.org/jira/browse/SOLR-14853

Ports: TYPO3-Solr#3748
  • Loading branch information
dkd-kaehm authored and dkd-friedrich committed Mar 13, 2024
1 parent 29c1933 commit 1bc890c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ If applicable, add screenshots to help explain your problem.
- TYPO3 Version: [e.g. 11.5.36]
- Browser: [e.g. chrome, safari]
- EXT:solr Version: [e.g. 11.6.0]
- Used Apache Solr Version: [e.g. 9.2.1]
- Used Apache Solr Version: [e.g. 9.3.0]
- PHP Version: [e.g. 8.2.0]
- MySQL Version: [e.g. 8.0.0]

Expand Down
9 changes: 7 additions & 2 deletions Docker/SolrServer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM solr:9.2.1
FROM solr:9.3.0
MAINTAINER dkd Internet Service GmbH <[email protected]>
ENV TERM linux

Expand All @@ -11,7 +11,12 @@ RUN rm -fR /opt/solr/server/solr/* \
&& groupmod --non-unique --gid "${SOLR_UNIX_GID}" solr \
&& chown -R solr:solr /var/solr /opt/solr \
&& apt update && apt upgrade -y && apt install sudo -y \
&& echo "solr ALL=NOPASSWD: /docker-entrypoint-initdb.d/as-sudo/*" > /etc/sudoers.d/solr
&& echo "solr ALL=NOPASSWD: /docker-entrypoint-initdb.d/as-sudo/*" > /etc/sudoers.d/solr \
&& echo "# EXT:solr relevant changes: " >> /etc/default/solr.in.sh \
&& echo "SOLR_ENABLE_REMOTE_STREAMING=true" >> /etc/default/solr.in.sh \
&& echo "SOLR_ENABLE_STREAM_BODY=true" >> /etc/default/solr.in.sh \
&& echo "# END: EXT:solr" >> /etc/default/solr.in.sh \

COPY Docker/SolrServer/docker-entrypoint-initdb.d/ /docker-entrypoint-initdb.d
USER solr

Expand Down
2 changes: 1 addition & 1 deletion Documentation/Appendix/VersionMatrix.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Requirements for EXT:solr* 11.6 stack
------------------------------- ---------------------------------------------- --------------------------------------------- ---------------------------------
TYPO3 EXT: solr EXT:tika EXT:solrfal EXT:solrconsole EXT:solrdebugtools EXT:solrfluidgrouping EXT:solrmlt Apache Solr Configset
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================
11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.2.1¹ ext_solr_11_6_0
11.5 11.6 11.0 11.0 11.0 11.0 11.0 11.0 (Ø) 9.3.0¹ ext_solr_11_6_0
========= ========== ========== =========== =============== ================== ============================= =============== =============== =================

| ¹ - recommended Apache Solr version, check version matrix in composer.json (`composer info:solr-versions`) for full list
9 changes: 5 additions & 4 deletions Documentation/Solr/ConfigurationStructures.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ When you want to install solr on your system in another way the following steps

* Install the solr server
* Copy the configsets into the configset folder (by default $SOLR_HOME/server/solr/configsets)
* Make sure that the solr.xml file ($SOLR_HOME/server/solr/solr.xml) is in place an fits to your solr version
* Make sure that the solr.xml file ($SOLR_HOME/server/solr/solr.xml) is in place and fits to your Solr version
* Enable Content Streams. EXT:solr uses content streams and requires environment variables SOLR_ENABLE_REMOTE_STREAMING and SOLR_ENABLE_STREAM_BODY to be set, see section `Content Streams in the Reference Guide <https://solr.apache.org/guide/solr/latest/indexing-guide/content-streams.html>`__

* Create an init script that start solr on boottime.
* Secure your solr port from outside.
* Make sure that solr is running with an own user.
* Create an init script that starts Solr on boottime.
* Secure your Solr port from outside.
* Make sure that Solr is running with an own user.
* Backup your data folders

*Hint:* Apache Solr ships an install script in newer version that might cover your requirements for production
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<config name="tx_solr-11-6-0--20240313">

<luceneMatchVersion>9.2.0</luceneMatchVersion>
<luceneMatchVersion>9.3.0</luceneMatchVersion>

<abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>

Expand Down Expand Up @@ -132,8 +132,7 @@


<requestDispatcher handleSelect="false" >
<!-- Make sure your system has some authentication! before using enableRemoteStreaming="true" -->
<requestParsers enableRemoteStreaming="true" enableStreamBody="true" multipartUploadLimitInKB="2048000" />
<requestParsers multipartUploadLimitInKB="2048000" />

<httpCaching lastModifiedFrom="openTime" etagSeed="Solr" />
<httpCaching never304="true"/>
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"ext-solrfluidgrouping": "^11.0",
"ext-solrmlt": "^11.0",
"Apache-Solr": [
"9.2.1"
"9.3.0"
],
"configset": "ext_solr_11_6_0"
},
Expand Down

0 comments on commit 1bc890c

Please sign in to comment.