X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=blobdiff_plain;f=dev-deploy.yml;h=ed2df3d73e3f63d513470e5ddc0a1dbf807492d0;hp=7c07ddd6611d280607f9664ae94f9b994ed68f75;hb=a1ee7faea0cc4101a215f3da48a2804b98d37844;hpb=736ca216d35802fb46b080c54d1c56becb3ca484

diff --git a/dev-deploy.yml b/dev-deploy.yml
index 7c07ddd..ed2df3d 100644
--- a/dev-deploy.yml
+++ b/dev-deploy.yml
@@ -7,21 +7,33 @@
     - 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
       file: path={{ item }} state=directory
       with_items:
         - /usr/share/masterkey/lui
-        - /var/lib/masterkey/lui/data/lui
+        - /var/lib/masterkey/lui/solr/lui
         - /var/log/masterkey/lui
-        - /etc/masterkey
+        - /etc/masterkey/lui
 
     - name: Create lui-solr account
       become: yes
@@ -36,15 +48,15 @@
 
     - name: Link Solr configuration
       become: yes
-      file: src=/vagrant/conf path=/etc/masterkey/lui state=link
+      file: src=/vagrant/conf/solr path=/etc/masterkey/lui/solr state=link
 
     - name: Link Solr defaults
       become: yes
-      file: src=/etc/masterkey/lui/lui-solr.in.sh path=/etc/default/lui-solr.in.sh state=link
+      file: src=/etc/masterkey/lui/solr/lui-solr.in.sh path=/etc/default/lui-solr.in.sh state=link
 
     - 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
@@ -52,4 +64,4 @@
       with_items:
         - /var/lib/masterkey/lui/log4j.properties
         - /var/lib/masterkey/lui/logs
-        - /var/lib/masterkey/lui/data/solr.xml
+        - /var/lib/masterkey/lui/data