This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4b5531fcc8929e96415bff7631bf83d1cc369841
Author: Marc-Aurèle Brothier <m...@brothier.org>
AuthorDate: Mon Jul 31 08:18:43 2017 +0200
Remove dependency on tomcat, modify installation script for debian
---
debian/cloudstack-management.install | 13 -------------
debian/cloudstack-management.postinst | 20 --------------------
debian/control | 2 +-
debian/rules | 10 ++++++----
4 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/debian/cloudstack-management.install
b/debian/cloudstack-management.install
index 9c3f04e..353813d 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -15,25 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-/etc/cloudstack/management/catalina.policy
-/etc/cloudstack/management/catalina.properties
-/etc/cloudstack/management/logging.properties
/etc/cloudstack/management/ehcache.xml
-/etc/cloudstack/management/server-ssl.xml
-/etc/cloudstack/management/server-nonssl.xml
-/etc/cloudstack/management/server7-ssl.xml
-/etc/cloudstack/management/server7-nonssl.xml
-/etc/cloudstack/management/classpath.conf
/etc/cloudstack/management/db.properties
-/etc/cloudstack/management/tomcat6-ssl.conf
-/etc/cloudstack/management/tomcat6-nonssl.conf
-/etc/cloudstack/management/tomcat6.conf
/etc/cloudstack/management/web.xml
/etc/cloudstack/management/environment.properties
/etc/cloudstack/management/java.security.ciphers
/etc/cloudstack/management/log4j-cloud.xml
-/etc/cloudstack/management/tomcat-users.xml
-/etc/cloudstack/management/context.xml
/etc/default/cloudstack-management
/etc/init.d/cloudstack-management
/etc/security/limits.d/cloudstack-limits.conf
diff --git a/debian/cloudstack-management.postinst
b/debian/cloudstack-management.postinst
index 240224d..0891f70 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -61,26 +61,6 @@ if [ "$1" = configure ]; then
chmod 0640 ${CONFDIR}/${DBPROPS}
chgrp cloud ${CONFDIR}/${DBPROPS}
- if [ -d "/usr/share/tomcat7" ]; then
- rm -f /usr/share/cloudstack-management/bin
- rm -f /usr/share/cloudstack-management/lib
- ln -s /usr/share/tomcat7/bin /usr/share/cloudstack-management/bin
- ln -s /usr/share/tomcat7/lib /usr/share/cloudstack-management/lib
- invoke-rc.d tomcat7 stop || true
- if [ ! -f "/etc/cloudstack/management/server.xml" ]; then
- ln -s /etc/cloudstack/management/server7-nonssl.xml
/etc/cloudstack/management/server.xml
- fi
- elif [ -d "/usr/share/tomcat6" ]; then
- rm -f /usr/share/cloudstack-management/bin
- rm -f /usr/share/cloudstack-management/lib
- ln -s /usr/share/tomcat6/bin /usr/share/cloudstack-management/bin
- ln -s /usr/share/tomcat6/lib /usr/share/cloudstack-management/lib
- invoke-rc.d tomcat6 stop || true
- if [ ! -f "/etc/cloudstack/management/server.xml" ]; then
- ln -s /etc/cloudstack/management/server-nonssl.xml
/etc/cloudstack/management/server.xml
- fi
- fi
-
# Add jdbc MySQL driver settings to db.properties if not present
grep -s -q "db.cloud.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS} || sed -i -e
"\$adb.cloud.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS}
grep -s -q "db.usage.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS} || sed -i -e
"\$adb.usage.driver=jdbc:mysql" ${CONFDIR}/${DBPROPS}
diff --git a/debian/control b/debian/control
index f402325..971b0a8 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are
shared by several C
Package: cloudstack-management
Architecture: all
-Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless |
java8-runtime | openjdk-7-jre-headless, cloudstack-common (=
${source:Version}), tomcat6 | tomcat7, sudo, jsvc, python-mysql.connector,
libmysql-java, augeas-tools, mysql-client, adduser, bzip2, ipmitool,
lsb-release, init-system-helpers (>= 1.14~)
+Depends: ${python:Depends}, openjdk-8-jre-headless | java8-runtime-headless |
java8-runtime | openjdk-7-jre-headless, cloudstack-common (=
${source:Version}), sudo, jsvc, python-mysql.connector, libmysql-java,
augeas-tools, mysql-client, adduser, bzip2, ipmitool, lsb-release,
init-system-helpers (>= 1.14~)
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
diff --git a/debian/rules b/debian/rules
index 82a40239..6fc10ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,6 @@ override_dh_auto_install:
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
mkdir -p $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management
- mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-management/setup
mkdir $(DESTDIR)/var/log/$(PACKAGE)/management
mkdir $(DESTDIR)/var/cache/$(PACKAGE)/management
@@ -76,21 +75,24 @@ override_dh_auto_install:
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/management
mkdir $(DESTDIR)/var/lib/$(PACKAGE)/mnt
cp -r client/target/utilities/scripts/db/*
$(DESTDIR)/usr/share/$(PACKAGE)-management/setup/
- cp -r client/target/cloud-client-ui-$(VERSION)/*
$(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/
cp server/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/
cp client/target/conf/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/
+ cp client/target/cloud-client-ui-$(VERSION).jar
$(DESTDIR)/usr/share/$(PACKAGE)-management/
+ # To have a uniq name across versions for the startup script
+ ln -s cloud-client-ui-$(VERSION).jar
$(DESTDIR)/usr/share/$(PACKAGE)-management/cloud-management-server.jar
+ cp client/target/bcprov-jdk15on-1.55.jar
$(DESTDIR)/usr/share/$(PACKAGE)-management/
+ # To make jetty happy from the 1st line of log
+ ln -s log4j-cloud.xml
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/log4j.xml
# nast hack for a couple of configuration files
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-limits.conf
$(DESTDIR)/$(SYSCONFDIR)/security/limits.d/
mv $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/server/cloudstack-sudoers
$(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)
chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/$(PACKAGE)
- ln -s tomcat6-nonssl.conf
$(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf
install -D packaging/debian/init/cloud-management
$(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management
install -D client/target/utilities/bin/cloud-update-xenserver-licenses
$(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses
# 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 ../../../var/log/$(PACKAGE)/management
$(DESTDIR)/usr/share/$(PACKAGE)-management/logs
ln -s ../../../var/cache/$(PACKAGE)/management/temp
$(DESTDIR)/usr/share/$(PACKAGE)-management/temp
--
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.
