X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=dev-deploy.yml;h=ed2df3d73e3f63d513470e5ddc0a1dbf807492d0;hp=a3908e3f984588144916375772c70b0c806dcf16;hb=HEAD;hpb=1b8744e13ed96e39e1e6b1d98bab6ad15ccfb1ab

diff --git a/dev-deploy.yml b/dev-deploy.yml
index a3908e3..ed2df3d 100644
--- a/dev-deploy.yml
+++ b/dev-deploy.yml
@@ -7,12 +7,24 @@
     - name: Update apt-cache
       become: yes
       apt: update-cache=yes
+
+    - name: Install python-apt
+      become: yes
+      apt: name=python-apt state=present
       
-    - name: Install dependencies from apt
+    - name: Add backports apt repo
       become: yes
-      apt: name={{ item }} state=present
-      with_items:
-        - openjdk-7-jdk
+      apt_repository: repo="deb http://ftp.debian.org/debian jessie-backports main" state=present update_cache=yes
+      
+    - name: Install openjdk from backports
+      become: yes
+      apt: name=openjdk-8-jdk state=present default_release=jessie-backports
+
+    - name: Make Java 8 the system default
+      become: yes
+      shell: update-java-alternatives --set java-1.8.0-openjdk-amd64 && touch /etc/.set_javadefault_ansible
+      args:
+        creates: /etc/.set_javadefault_ansible
 
     - name: Create deployment environment
       become: yes
@@ -44,7 +56,7 @@
 
     - name: Install Solr binary
       become: yes
-      command: /vagrant/dist/install_solr_service.sh /vagrant/dist/solr-5.5.1.tgz -d /var/lib/masterkey/lui -i /usr/share/masterkey/lui -s lui-solr -u lui-solr -f creates=/usr/share/masterkey/lui/solr-5.5.1
+      command: /vagrant/dist/install_solr6_service.sh /vagrant/dist/solr-6.1.0.tgz -d /var/lib/masterkey/lui -i /usr/share/masterkey/lui -s lui-solr -u lui-solr -f creates=/usr/share/masterkey/lui/solr-6.1.0
 
     - name: Remove extra files created by Solr install
       become: yes