Prepare for Solr 6 [SOLR-26]

[lui-solr.git] / dev-deploy.yml

diff --git a/dev-deploy.yml b/dev-deploy.yml
index 7c07ddd..ad8eacd 100644 (file)
--- a/dev-deploy.yml
+++ b/dev-deploy.yml
@@ -19,9 +19,9 @@
       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 +36,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_solr5_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
 
     - name: Remove extra files created by Solr install
       become: yes
@@ -52,4 +52,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