Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to Solr 6.2.1; Address #379. #407

Merged
merged 4 commits into from
Nov 29, 2016
Merged

Move to Solr 6.2.1; Address #379. #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5962c47
Move to Solr 6.2.1; Address #379.
ruebot Oct 29, 2016
c22c252
fix submodules
ruebot Nov 1, 2016
1a19e1f
rebase
ruebot Nov 22, 2016
561cb54
Merge branch 'master' of github.com:Islandora-CLAW/CLAW into issue-379
ruebot Nov 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion install/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ The default VM login details are:
- MySQL 5.7.15
- Apache 2.4.18
- Tomcat 7.0.68.0
- Solr 4.10.3
- Solr 6.2.1
- Camel 2.15.1
- Fedora 4.6.0
- Fedora Camel Component 4.4.0
Expand Down
1 change: 1 addition & 0 deletions install/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.network :forwarded_port, guest: 3306, host: 3306 # MySQL
config.vm.network :forwarded_port, guest: 5432, host: 5432 # PostgreSQL
config.vm.network :forwarded_port, guest: 8383, host: 8383 # Loris
config.vm.network :forwarded_port, guest: 8983, host: 8983 # Solr

config.vm.provider "virtualbox" do |vb|
vb.customize ["modifyvm", :id, "--memory", $memory]
Expand Down
3 changes: 1 addition & 2 deletions install/configs/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ KARAF_DIR="/opt/karaf"
KARAF_CLIENT="$KARAF_DIR/bin/client"
KARAF_CONFIGS="$HOME_DIR/islandora/install/configs/karaf/"
CAMEL_VERSION=4.4.0
SOLR_VERSION=4.10.3
SOLR_HOME="/var/lib/tomcat7/solr"
SOLR_VERSION=6.2.1
BLAZEGRAPH_VERSION=2.1.4
DRUPAL_HOME="/var/www/html/drupal"
DRUPAL_VERSION=8.2.2
Expand Down
31 changes: 4 additions & 27 deletions install/scripts/solr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,9 @@ if [ ! -f "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" ]; then
wget -q -O "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" "http://archive.apache.org/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz"
fi

# Prepare SOLR_HOME
if [ ! -d "$SOLR_HOME" ]; then
mkdir "$SOLR_HOME"
fi

cp -v "$DOWNLOAD_DIR/solr-$SOLR_VERSION.tgz" /tmp
cd /tmp
tar -xzf solr-"$SOLR_VERSION".tgz
cp "solr-$SOLR_VERSION/dist/solr-$SOLR_VERSION.war" /var/lib/tomcat7/webapps/solr.war
chown tomcat7:tomcat7 /var/lib/tomcat7/webapps/solr.war

if [ ! -f "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" ]; then
echo "Downloading commons-logging-1.1.2.jar"
wget -q -O "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" "http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.2/commons-logging-1.1.2.jar"
fi
cp "$DOWNLOAD_DIR/commons-logging-1.1.2.jar" /usr/share/tomcat7/lib
cp /tmp/solr-"$SOLR_VERSION"/example/lib/ext/slf4j* /usr/share/tomcat7/lib
cp /tmp/solr-"$SOLR_VERSION"/example/lib/ext/log4j* /usr/share/tomcat7/lib

chown -hR tomcat7:tomcat7 /usr/share/tomcat7/lib

cp -R /tmp/solr-"$SOLR_VERSION"/example/solr/* "$SOLR_HOME"

chown -hR tomcat7:tomcat7 "$SOLR_HOME"

touch /var/lib/tomcat7/velocity.log
chown tomcat7:tomcat7 /var/lib/tomcat7/velocity.log

service tomcat7 restart
tar xzf solr-"$SOLR_VERSION".tgz solr-"$SOLR_VERSION"/bin/install_solr_service.sh --strip-components=2
bash ./install_solr_service.sh solr-"$SOLR_VERSION".tgz
cd /opt/solr
sudo -u solr bin/solr create_core -c CLAW