debian: Management server packaging fixes

wido · wido · commit a773ed88b729 · 2013-04-05T16:13:42.000+02:00
We should be carefull what we package since all configuration should
be in /etc/cloudstack/management

Signed-off-by: Wido den Hollander &lt;wido@widodh.nl&gt;
diff --git a/client/tomcatconf/server.xml.in b/client/tomcatconf/server.xml.in
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
@@ -15,7 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/etc/cloudstack/server/*
 /etc/cloudstack/management/*
 /etc/init.d/cloudstack-management
 /etc/security/limits.d/cloudstack-limits.conf
@@ -31,4 +30,3 @@
 /usr/bin/cloud-setup-databases
 /usr/bin/cloud-migrate-databases
 /usr/share/cloudstack-management/*
-/usr/share/tomcat6/lib/*
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
@@ -6,9 +6,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -27,10 +27,7 @@ if [ "$1" = configure ]; then
         /var/cache/cloudstack/management/work \
         /var/cache/cloudstack/management/temp \
         /var/log/cloudstack/management \
-        /etc/cloudstack/management/Catalina \
-        /etc/cloudstack/management/Catalina/localhost \
-        /var/lib/cloudstack/management \
-        /etc/cloudstack/management/Catalina/localhost/client
+        /var/lib/cloudstack/management
     do
         chmod 0770 $i
         chgrp cloud $i
diff --git a/debian/rules b/debian/rules
@@ -98,14 +98,15 @@ install:
 	chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/cloudstack
 
 	ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
-	mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client
-	mkdir -p ${DESTDIR}/usr/share/tomcat6/lib
+	ln -s server-nonssl.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/server.xml
 	install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
 	install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses
 	ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin
+	# Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF
+	# This should all be in /etc/cloudstack/management
+	rm $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/WEB-INF/classes/*.*
 	ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf
 	ln -s ../../../usr/share/tomcat6/lib $(DESTDIR)/usr/share/$(PACKAGE)-management/lib
-	ln -s ../../java/$(PACKAGE)-server.jar $(DESTDIR)/usr/share/tomcat6/lib/$(PACKAGE)-server.jar
 	ln -s ../../../var/log/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/logs
 	ln -s ../../../var/cache/$(PACKAGE)/management/temp $(DESTDIR)/usr/share/$(PACKAGE)-management/temp
 	ln -s ../../../var/cache/$(PACKAGE)/management/work $(DESTDIR)/usr/share/$(PACKAGE)-management/work
