Update Solr example to use Ubuntu 16.04 and Apache Solr 6.1.0.

Author: geerlingguy

solr/README.md

@@ -2,10 +2,9 @@
 
 This project aims to make spinning up a simple local Apache Solr environment incredibly quick and easy, and to introduce users to the fast and powerful search engine behind some of the largest document collections on the Internet.
 
-It will install the following on a Ubuntu 12.04 linux VM:
+It will install the following on a Ubuntu 16.04 linux VM:
 
  - Java
- - Apache Tomcat 7
  - Apache Solr
 
 It should take 5-10 minutes to build or rebuild the VM from scratch on a decent broadband connection.
@@ -41,4 +40,4 @@ Note: *If there are any errors during the course of running `vagrant up`, and it
 
 ## About the Author
 
-This project was created by [Jeff Geerling](http://jeffgeerling.com/) as an example for [Ansible for DevOps](http://www.ansiblefordevops.com/).
+This project was created by [Jeff Geerling](http://www.jeffgeerling.com/) as an example for [Ansible for DevOps](http://www.ansiblefordevops.com/).

solr/Vagrantfile

@@ -4,12 +4,13 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- config.vm.box = "geerlingguy/ubuntu1204"
+ config.vm.box = "geerlingguy/ubuntu1604"
  config.vm.network :private_network, ip: "192.168.66.66"
+ config.vm.hostname = "solr.dev"
  config.ssh.insert_key = false
 
  config.vm.provider :virtualbox do |v|
- v.memory = 512
+ v.memory = 1024
  end
 
  # Ansible provisioner.

solr/provisioning/playbook.yml

@@ -9,92 +9,36 @@
  apt: update_cache=yes cache_valid_time=3600
 
  handlers:
- - name: restart tomcat
- service: name=tomcat7 state=restarted
+ - name: restart solr
+ service: name=solr state=restarted
 
  tasks:
- - name: Install Tomcat 7.
- apt: "name={{ item }} state=present"
- with_items:
- - tomcat7
- - tomcat7-admin
-
- - name: Ensure Tomcat 7 is started and enabled on boot.
- service: name=tomcat7 state=started enabled=yes
+ - name: Install Java.
+ apt: name=openjdk-8-jdk state=present
 
  - name: Download Solr.
  get_url:
  url: "https://archive.apache.org/dist/lucene/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz"
  dest: "{{ download_dir }}/solr-{{ solr_version }}.tgz"
- sha256sum: "{{ solr_sha256sum }}"
+ checksum: "{{ solr_checksum }}"
 
  - name: Expand Solr.
- command: >
- tar -C /tmp -xvzf {{ download_dir }}/solr-{{ solr_version }}.tgz
- creates={{ download_dir }}/solr-{{ solr_version }}/dist/solr-{{ solr_version }}.war
-
- - name: Copy Solr into place.
- command: >
- cp -r {{ download_dir }}/solr-{{ solr_version }} \
- {{ solr_dir }}
- creates={{ solr_dir }}/dist/solr-{{ solr_version }}.war
+ unarchive:
+ src: "{{ download_dir }}/solr-{{ solr_version }}.tgz"
+ dest: "{{ download_dir }}"
+ copy: no
+ creates: "{{ download_dir }}/solr-{{ solr_version }}/README.txt"
 
- # Use shell so commands are passed in correctly.
- - name: Copy Solr components into place.
+ - name: Run Solr installation script.
  shell: >
- cp -r {{ item.src }} {{ item.dest }}
- creates={{ item.creates }}
- with_items:
- # Solr example configuration and war file.
- - src: "{{ solr_dir }}/example/webapps/solr.war"
- dest: "{{ solr_dir }}/solr.war"
- creates: "{{ solr_dir }}/solr.war"
-
- - src: "{{ solr_dir }}/example/solr/*"
- dest: "{{ solr_dir }}/"
- creates: "{{ solr_dir }}/solr.xml"
-
- # Solr log4j logging configuration.
- - src: "{{ solr_dir }}/example/lib/ext/*"
- dest: "/var/lib/tomcat7/shared/"
- creates: "/var/lib/tomcat7/shared/log4j-1.2.17.jar"
-
- - src: "{{ solr_dir }}/example/resources/log4j.properties"
- dest: "/var/lib/tomcat7/shared/classes"
- creates: "/var/lib/tomcat7/shared/classes/log4j.properties"
- notify: restart tomcat
-
- - name: Ensure solr example directory is absent.
- file:
- path: "{{ solr_dir }}/example"
- state: absent
-
- - name: Set up solr data directory.
- file:
- path: "{{ solr_dir }}/data"
- state: directory
- owner: tomcat7
- group: tomcat7
-
- - name: Configure solrconfig.xml for new data directory.
- lineinfile:
- dest: "{{ solr_dir }}/collection1/conf/solrconfig.xml"
- regexp: "^.*<dataDir.+$"
- line: "<dataDir>${solr.data.dir:{{ solr_dir }}/data}</dataDir>"
- state: present
-
- - name: Set permissions for solr home.
- file:
- path: "{{ solr_dir }}"
- recurse: yes
- owner: tomcat7
- group: tomcat7
-
- - name: Add Catalina configuration for solr.
- template:
- src: templates/solr.xml.j2
- dest: /etc/tomcat7/Catalina/localhost/solr.xml
- owner: root
- group: tomcat7
- mode: 0644
- notify: restart tomcat
+ {{ download_dir }}/solr-{{ solr_version }}/bin/install_solr_service.sh
+ {{ download_dir }}/solr-{{ solr_version }}.tgz
+ -i /opt
+ -d /var/solr
+ -u solr
+ -s solr
+ -p 8983
+ creates={{ solr_dir }}/bin/solr
+
+ - name: Ensure solr is started and enabled on boot.
+ service: name=solr state=started enabled=yes

solr/provisioning/vars.yml

@@ -6,5 +6,5 @@ download_dir: /tmp
 solr_dir: /opt/solr
 
 # Solr version and download information.
-solr_version: 4.10.4
-solr_sha256sum: ac3543880f1b591bcaa962d7508b528d7b42e2b5548386197940b704629ae851
+solr_version: 6.1.0
+solr_checksum: sha1:41045799ed9b5f826b0dcab4b28b3b1986afa523