diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-10-08 08:02:28 -0500 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-10-08 08:05:43 -0500 |
| commit | b224cb40ad545da1f09dcf0d8bafb8baf0e1b110 (patch) | |
| tree | 52704cf2452acee81c7257c5aaac71b6e693fa0a /textproc/apache-solr/files | |
| parent | shells/bash: Improve message for PORTS_READLINE_BROKEN (diff) | |
textproc/apache-solr: Update version 8.11.2=>9.0.0
- Pet portclippy
IMPORTANT NOTE:
Data Import Handler has been removed from this version. Please use the
third party community plugin from:
https://github.com/rohitbemax/dataimporthandler
Approved by: mfechner (By implicit mail in developers@)
Sponsored by: Bounce Experts
Diffstat (limited to 'textproc/apache-solr/files')
| -rw-r--r-- | textproc/apache-solr/files/patch-bin_solr | 14 | ||||
| -rw-r--r-- | textproc/apache-solr/files/pkg-message.in | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/textproc/apache-solr/files/patch-bin_solr b/textproc/apache-solr/files/patch-bin_solr index 0ea5bdcbddd3..1c15691df53e 100644 --- a/textproc/apache-solr/files/patch-bin_solr +++ b/textproc/apache-solr/files/patch-bin_solr @@ -1,6 +1,6 @@ ---- bin/solr.orig 2020-10-28 09:40:06 UTC +--- bin/solr.orig 2022-04-25 20:37:26 UTC +++ bin/solr -@@ -2255,13 +2255,12 @@ function start_solr() { +@@ -2269,13 +2269,12 @@ function start_solr() { echo "" fi # no lsof on cygwin though @@ -10,19 +10,19 @@ (loops=0 while true do -- running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN) +- running=$(lsof -t -PniTCP:$SOLR_PORT -sTCP:LISTEN || :) + running=$(sockstat -ls -P tcp -p $SOLR_PORT | grep LISTEN) - if [ -z "$running" ]; then - slept=$((loops * 2)) + if [ -z "${running:-}" ]; then + slept=$((loops * 2)) if [ $slept -lt $SOLR_START_WAIT ]; then -@@ -2279,13 +2278,6 @@ function start_solr() { +@@ -2293,13 +2292,6 @@ function start_solr() { fi done) & spinner $! - else - echo -e "NOTE: Please install lsof as this script needs it to determine if Solr is listening on port $SOLR_PORT." - sleep 10 -- SOLR_PID=`ps auxww | grep start\.jar | grep -w "\-Djetty\.port=$SOLR_PORT" | grep -v grep | awk '{print $2}' | sort -r` +- SOLR_PID=`ps auxww | grep start\.jar | awk "/\-Djetty\.port=$SOLR_PORT/"' {print $2}' | sort -r` - echo -e "\nStarted Solr server on port $SOLR_PORT (pid=$SOLR_PID). Happy searching!\n" - return; - fi diff --git a/textproc/apache-solr/files/pkg-message.in b/textproc/apache-solr/files/pkg-message.in index 9a5826983431..4ff8a03f0ec2 100644 --- a/textproc/apache-solr/files/pkg-message.in +++ b/textproc/apache-solr/files/pkg-message.in @@ -14,11 +14,6 @@ http://lucene.apache.org/solr/resources.html#documentation The port is configured to listen only on localhost, port 8983. -To have a working initial config, use: - -cp -R %%LOCALBASE%%/solr/example/example-DIH/solr/solr /var/db/solr/ -chown -R solr /var/db/solr/solr - To rotate solr log files include /var/log/solr/ to your log rotation configuration. @@ -37,9 +32,14 @@ If you would like to change logging, copy: cp %%LOCALBASE%%/solr/server/resources/log4j2.xml /var/db/solr/ Change it and make sure it is loaded in %%LOCALBASE%%/etc/solr.in.sh. +Data Import Handler (DIH) has been removed from the base solr and is +available as independent module which can be installed with solr +package manager. The current repo is available at: +https://github.com/rohitbemax/dataimporthandler + Make also sure to always check the manual if you need to modify your configs or schemas: -https://solr.apache.org/guide/8_9/solr-upgrade-notes.html +https://solr.apache.org/guide/9_0/solr-upgrade-notes.html EOM } ] |