Fix post inst/rm for solr 4

diff --git a/debian/masterkey-lui-solr4-master-tomcat6.postinst b/debian/masterkey-lui-solr4-master-tomcat6.postinst
index 9b4ba0a..c8c84fb 100644 (file)
--- a/debian/masterkey-lui-solr4-master-tomcat6.postinst
+++ b/debian/masterkey-lui-solr4-master-tomcat6.postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
-ln -sf /etc/masterkey/lui/lui-solr-master.xml /etc/tomcat6/Catalina/localhost/solr.xml
-chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/master
+ln -sf /etc/masterkey/lui/lui-solr4-master.xml /etc/tomcat6/Catalina/localhost/solr4.xml
+chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr4/master

diff --git a/debian/masterkey-lui-solr4-master-tomcat6.postrm b/debian/masterkey-lui-solr4-master-tomcat6.postrm
index 8b3502e..d9015e2 100644 (file)
--- a/debian/masterkey-lui-solr4-master-tomcat6.postrm
+++ b/debian/masterkey-lui-solr4-master-tomcat6.postrm
@@ -2,7 +2,7 @@
 
 case "$1" in
     purge|remove)
-       rm -f /etc/tomcat6/Catalina/localhost/solr.xml
+       rm -f /etc/tomcat6/Catalina/localhost/solr4.xml
 #      rm -f /etc/tomcat6/policy.d/05harvester.policy
         ;;
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)

diff --git a/debian/masterkey-lui-solr4-slave-tomcat6.postinst b/debian/masterkey-lui-solr4-slave-tomcat6.postinst
index a647647..ea92d0e 100644 (file)
--- a/debian/masterkey-lui-solr4-slave-tomcat6.postinst
+++ b/debian/masterkey-lui-solr4-slave-tomcat6.postinst
@@ -1,3 +1,3 @@
 #!/bin/sh
-ln -sf /etc/masterkey/lui/lui-solr-slave.xml /etc/tomcat6/Catalina/localhost/solr-slave.xml
-chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr/slave
+ln -sf /etc/masterkey/lui/lui-solr4-slave.xml /etc/tomcat6/Catalina/localhost/solr4-slave.xml
+chown -R tomcat6:tomcat6 /var/lib/masterkey/lui/solr4/slave

diff --git a/debian/masterkey-lui-solr4-slave-tomcat6.postrm b/debian/masterkey-lui-solr4-slave-tomcat6.postrm
index 2c4542a..086454d 100644 (file)
--- a/debian/masterkey-lui-solr4-slave-tomcat6.postrm
+++ b/debian/masterkey-lui-solr4-slave-tomcat6.postrm
@@ -2,7 +2,7 @@
 
 case "$1" in
     purge|remove)
-       rm -f /etc/tomcat6/Catalina/localhost/solr-slave.xml
+       rm -f /etc/tomcat6/Catalina/localhost/solr4-slave.xml
 #      rm -f /etc/tomcat6/policy.d/05harvester.policy
         ;;
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)