Fixes #1518: Update Solr role to work better with really old Solr versions under systemd.

Author: geerlingguy

provisioning/requirements.yml

@@ -56,7 +56,7 @@
 - src: geerlingguy.php-tideways
   version: 2.1.0
 - src: geerlingguy.php-versions
-  version: 2.1.2
+  version: 2.1.3
 - src: geerlingguy.php-xdebug
   version: 2.5.0
 - src: geerlingguy.php-xhprof
@@ -76,6 +76,6 @@
 - src: geerlingguy.security
   version: 1.7.0
 - src: geerlingguy.solr
-  version: 4.1.0
+  version: 4.2.0
 - src: geerlingguy.varnish
   version: 2.3.0

provisioning/roles/geerlingguy.php-versions/tasks/main.yml

@@ -2,8 +2,8 @@
 - name: Include OS-specific variables.
   include_vars: "{{ item }}"
   with_fileglob:
-    - "../vars/{{ ansible_os_family }}.yml"
-    - "../vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_os_family }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_os_family }}-php{{ php_version }}.yml"
 
 - name: Define PHP variables.
   set_fact: "{{ item.key }}={{ hostvars[inventory_hostname][item.value] }}"

provisioning/roles/geerlingguy.solr/.travis.yml

@@ -17,10 +17,12 @@ env:
     playbook: test-solr-6.yml
   - distro: debian9
     playbook: test-solr-6.yml
+  - distro: ubuntu1604
+    playbook: test-solr-4.yml
+  - distro: ubuntu1604
+    playbook: test-solr-3.yml
   - distro: ubuntu1404
     playbook: test-solr-5.yml
-  - distro: ubuntu1204
-    playbook: test-solr-5.yml
   - distro: ubuntu1404
     playbook: test-solr-4.yml
   - distro: ubuntu1404

provisioning/roles/geerlingguy.solr/tasks/install-pre5.yml

@@ -58,26 +58,26 @@
     group: root
     mode: 0664
   changed_when: false
+  when: ansible_service_mgr != 'systemd'
 
 - name: Copy solr init script into place.
   template:
     src: "solr-init-{{ ansible_os_family }}-pre5.j2"
     dest: "/etc/init.d/{{ solr_service_name }}"
     mode: 0755
+  when: ansible_service_mgr != 'systemd'
 
 - name: Ensure daemon is installed (Debian).
   apt: name=daemon state=present
-  when: ansible_os_family == "Debian"
+  when:
+    - ansible_os_family == "Debian"
+    - ansible_service_mgr != 'systemd'
 
 - name: Copy solr systemd unit file into place (for systemd systems).
   template:
-    src: solr.unit.j2
+    src: solr-pre5.unit.j2
     dest: /etc/systemd/system/solr.service
     owner: root
     group: root
     mode: 0755
-  when: >
-    (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04') or
-    (ansible_distribution == 'Debian' and ansible_distribution_version|int >= 8) or
-    (ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 7) or
-    (ansible_distribution == 'Fedora')
+  when: ansible_service_mgr == 'systemd'

provisioning/roles/geerlingguy.solr/templates/solr-pre5.unit.j2

@@ -0,0 +1,13 @@
+[Unit]
+Description=Apache SOLR
+After=syslog.target network.target remote-fs.target nss-lookup.target
+
+[Service]
+Type=simple
+WorkingDirectory={{ solr_install_path }}/example
+ExecStart=/usr/bin/java -jar -Dsolr.solr.home={{ solr_home }} -Djetty.host={{ solr_host }} -Djetty.port={{ solr_port }} -Xms{{ solr_xms }} -Xmx{{ solr_xmx }} start.jar
+Restart=on-failure
+User=solr
+
+[Install]
+WantedBy=multi-user.target

provisioning/roles/geerlingguy.solr/templates/solr.unit.j2

@@ -3,8 +3,19 @@
 
   vars:
     solr_version: "3.6.2"
-    java_packages:
-      - openjdk-7-jdk
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    - name: Set Java 8 package for Debian > 8.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when:
+        - ansible_distribution == "Debian"
+        - ansible_distribution_version|int > 8
 
   roles:
     - geerlingguy.java

provisioning/roles/geerlingguy.solr/tests/test-solr-3.yml

@@ -4,8 +4,19 @@
   vars:
     solr_version: "4.10.4"
     solr_remove_cruft: true
-    java_packages:
-      - openjdk-7-jdk
+
+  pre_tasks:
+    - name: Update apt cache.
+      apt: update_cache=yes cache_valid_time=600
+      when: ansible_os_family == "Debian"
+
+    - name: Set Java 8 package for Debian > 8.
+      set_fact:
+        java_packages:
+          - openjdk-8-jdk
+      when:
+        - ansible_distribution == "Debian"
+        - ansible_distribution_version|int > 8
 
   roles:
     - geerlingguy.java