Merge pull request #693 from geerlingguy/solr-5-default

Issue #668: Default to Solr 5.x.
geerlingguy · Jun 3, 2016 · c028ce2 · c028ce2
2 parents 71f9fb2 + a1bf8a4
commit c028ce2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/default.config.yml b/default.config.yml
@@ -261,7 +261,7 @@ php_xdebug_idekey: PHPSTORM
 php_xdebug_max_nesting_level: 256
 
 # Solr Configuration (if enabled above).
-solr_version: "4.10.4"
+solr_version: "5.5.1"
 solr_xms: "64M"
 solr_xmx: "128M"
 

diff --git a/examples/acquia/acquia.config.yml b/examples/acquia/acquia.config.yml
@@ -1,7 +1,8 @@
 ---
+# Acquia Cloud uses Ubuntu 12.04 LTS.
 vagrant_box: geerlingguy/ubuntu1204
-solr_version: "4.5.1"
 
+# Acquia Cloud defaults to PHP 5.6.
 php_version: "5.6"
 php_packages:
   - php5
@@ -28,5 +29,7 @@ php_fpm_conf_path: "/etc/php5/fpm"
 php_fpm_pool_conf_path: "/etc/php5/fpm/pool.d/www.conf"
 php_mysql_package: php5-mysql
 
+# Acquia Cloud Search defaults to Solr 4.x.
+solr_version: "4.5.1"
 installed_extras:
   - solr
diff --git a/examples/scripts/configure-solr.sh b/examples/scripts/configure-solr.sh
@@ -10,23 +10,25 @@
 SOLR_SETUP_COMPLETE_FILE=/etc/drupal_vm_solr_config_complete
 
 # Search API Solr module.
-SOLR_DOWNLOAD=http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz
-SOLR_DOWNLOAD_DIR=/tmp
-SOLR_MODULE_NAME=search_api_solr
+SOLR_DOWNLOAD="http://ftp.drupal.org/files/projects/search_api_solr-8.x-1.x-dev.tar.gz"
+SOLR_DOWNLOAD_DIR="/tmp"
+SOLR_MODULE_NAME="search_api_solr"
+SOLR_VERSION="5.x"
+SOLR_CORE_PATH="/var/solr/data/collection1"
 
 # Check to see if we've already performed this setup.
 if [ ! -e "$SOLR_SETUP_COMPLETE_FILE" ]; then
   # Download and expand the Solr module.
   wget -qO- $SOLR_DOWNLOAD | tar xvz -C $SOLR_DOWNLOAD_DIR
 
   # Copy the Solr configuration into place over the default `collection1` core.
-  sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/4.x/. /var/solr/collection1/conf/
+  sudo cp -a $SOLR_DOWNLOAD_DIR/$SOLR_MODULE_NAME/solr-conf/$SOLR_VERSION/. $SOLR_CORE_PATH/conf/
 
   # Adjust the autoCommit time so index changes are committed in 1s.
-  sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' /var/solr/collection1/conf/solrconfig.xml
+  sudo sed -i 's/\(<maxTime>\)\([^<]*\)\(<[^>]*\)/\11000\3/g' $SOLR_CORE_PATH/conf/solrconfig.xml
 
   # Fix file permissions.
-  sudo chown -R solr:solr /var/solr/collection1/conf
+  sudo chown -R solr:solr $SOLR_CORE_PATH/conf
 
   # Restart Apache Solr.
   sudo service solr restart

diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
@@ -62,6 +62,6 @@
 - src: geerlingguy.security
   version: 1.2.0
 - src: geerlingguy.solr
-  version: 2.1.0
+  version: 3.1.0
 - src: geerlingguy.varnish
   version: 1.6.0