Merge pull request #63 from palantirnet/solr-fixes

Fix Solr installation

dev/Vagrantfile

@@ -33,6 +33,7 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "ansible", type: :ansible do |ansible|
     ansible.playbook = "../#{box_name}/#{box_name}.yml"
+    ansible.galaxy_role_file = "../#{box_name}/requirements.yml"
     ansible.groups = {
       "#{box_name}" => "default",
     }

drupalbox/CHANGELOG-0.0.md

@@ -6,9 +6,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
-### Fixed
+- Removed Jetty in favor of Solr's bundled HTTP server
+- Switched to the `geerlingguy.java` and `geerlingguy.solr` Ansible roles
+- Updated serverspec tests for Solr
 
-- Fixed the Jetty9 service
+### Fixed
 
 ## [1.1.0] - 2017-11-09
 

drupalbox/README.md

@@ -14,10 +14,12 @@
 
 ### Mailhog
 
-Mailhog's smtp service listens on port 1025, and its http service listens on port 8025; you can find the web UI at `http://yoursite.local:8025`
+Mailhog's smtp service listens on port `1025`, and its http service listens on port `8025`; you can find the web UI at `http://yoursite.local:8025`
 
 ### Solr
 
-Solr is installed to `/usr/share/solr/current` with two default cores, `drupal7` and `drupal8`. Solr runs on port 8983, and the web UI can be found at `http://yoursite.local:8983/solr`.
+This box runs Solr v4.5.1, to match one of the versions available on [Acquia](https://docs.acquia.com/article/how-test-custom-solr-schema-file-locally).
 
-In order to use it, you need to start Jetty, which can be managed with [palantirnet/the-vagrant](https://github.com/palantirnet/the-vagrant) in the `Vagrantfile`.
+Solr is installed to `/opt/solr` with two default cores, `drupal7` and `drupal8`. Solr runs on port `8983`, and the web UI can be found at `http://yoursite.local:8983/solr`.
+
+The Solr service runs by default; when you're using [palantirnet/the-vagrant](https://github.com/palantirnet/the-vagrant), this can be managed in the `Vagrantfile`.

drupalbox/drupalbox.json

@@ -190,6 +190,7 @@
       "type": "ansible-local",
       "playbook_dir": "provisioning",
       "playbook_file": "drupalbox/drupalbox.yml",
+      "galaxy_file": "drupalbox/requirements.yml",
       "inventory_groups": "drupalbox,all"
     },
     {

drupalbox/drupalbox.yml

@@ -6,13 +6,13 @@
     rvm1_install_path: /home/vagrant/.rvm
     php_xdebug_enabled: true
     php_ini_sendmail_path: "/usr/local/bin/mhsendmail"
-    jetty_server_enabled: false
-    jetty_server_java_options: "-Xmx256m -Djava.awt.headless=true -Dsolr.solr.home=/usr/share/solr/current"
     solr_cores:
       - name: drupal7
-        folder: search_api_solr-7x-1.11-4.x
+        module: search_api_solr-7.x-1.12
+        subdir: solr-conf/4.x
       - name: drupal8
-        folder: search_api_solr-8x-1.0-alpha5-4.x
+        module: search_api_solr-8.x-1.2
+        subdir: solr-conf/4.x
   vars_files:
     - vars/default/common.yml
     - vars/dev/mysql.yml
@@ -30,8 +30,19 @@
       }
     - { role: memcached }
     - { role: mailhog }
-    - { role: jetty9 }
-    - { role: solr }
+    - {
+        role: geerlingguy.java,
+        become: yes
+      }
+    - {
+        role: geerlingguy.solr,
+        solr_version: "4.5.1",
+        become: yes
+      }
+    - {
+        role: solr-configuration,
+        become: yes
+      }
     - { role: apache }
     - { role: mysql-client }
     - { role: mysql-server }

drupalbox/requirements.yml

@@ -0,0 +1,7 @@
+---
+
+- src: geerlingguy.java
+  version: 1.7.7
+
+- src: geerlingguy.solr
+  version: 4.0.2

drupalbox/tests/solr_spec.rb

@@ -1,13 +1,24 @@
 require_relative 'spec_helper.rb'
 
-describe file("/usr/share/solr") do
+describe file("/opt/solr") do
   it { should be_directory }
 end
 
-describe file("/usr/share/solr/current") do
-  it { should be_symlink }
+describe file("/var/log/solr.log") do
+  it { should be_file }
+  it { should be_owned_by 'solr' }
+  it { should be_grouped_into 'adm' }
 end
 
-describe file("/var/lib/jetty9/webapps/solr") do
-  it { should be_symlink }
+describe service('solr') do
+  it { should be_enabled }
+  it { should be_running }
+end
+
+describe port(8983) do
+  it { should be_listening }
+end
+
+describe command('curl http://127.0.0.1:8983/solr/admin/info/system?wt=json') do
+  its(:stdout) { should match /"solr-spec-version":"4\.5\.1"/ }
 end

provisioning/roles/.gitignore

@@ -0,0 +1,2 @@
+geerlingguy.java
+geerlingguy.solr