Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 36E5C200B66 for ; Thu, 18 Aug 2016 12:01:48 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 35A6F160AC1; Thu, 18 Aug 2016 10:01:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7FFD2160AAE for ; Thu, 18 Aug 2016 12:01:47 +0200 (CEST) Received: (qmail 92319 invoked by uid 500); 18 Aug 2016 10:01:46 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 92219 invoked by uid 99); 18 Aug 2016 10:01:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Aug 2016 10:01:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BD195E0159; Thu, 18 Aug 2016 10:01:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 18 Aug 2016 10:01:51 -0000 Message-Id: In-Reply-To: <2444db2cce944e7fbb2870696cb0be05@git.apache.org> References: <2444db2cce944e7fbb2870696cb0be05@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/50] [abbrv] git commit: updated refs/heads/4.9-bountycastle-daan to 8a03127 archived-at: Thu, 18 Aug 2016 10:01:48 -0000 packaging: Add db.X.driver=jdbc:mysql to db.properties on upgrade This is required afther the upgrade to 4.9.0 and for convience we add this to the configuration so our users do not have to. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/343ea609 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/343ea609 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/343ea609 Branch: refs/heads/4.9-bountycastle-daan Commit: 343ea6098e1884df410484149ed71ad8f51f4ec3 Parents: 1f9bf93 Author: Wido den Hollander Authored: Tue Jul 12 08:46:11 2016 +0200 Committer: Wido den Hollander Committed: Tue Jul 12 10:13:23 2016 +0200 ---------------------------------------------------------------------- debian/cloudstack-management.postinst | 5 +++++ packaging/centos63/cloud.spec | 4 ++++ packaging/centos7/cloud.spec | 4 ++++ 3 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/343ea609/debian/cloudstack-management.postinst ---------------------------------------------------------------------- diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index 145d1ea..e37813f 100644 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -58,6 +58,11 @@ if [ "$1" = configure ]; then chmod 0640 /etc/cloudstack/management/db.properties chgrp cloud /etc/cloudstack/management/db.properties invoke-rc.d tomcat6 stop || true + + # Add jdbc MySQL driver settings to db.properties if not present + grep "db.cloud.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.cloud.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + grep "db.usage.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.usage.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + grep "db.simulator.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.simulator.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties fi #DEBHELPER# http://git-wip-us.apache.org/repos/asf/cloudstack/blob/343ea609/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index c267e8f..2858395 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -408,6 +408,10 @@ if [ "$1" == "1" ] ; then /sbin/chkconfig --level 345 cloudstack-management on > /dev/null 2>&1 || true fi +grep "db.cloud.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.cloud.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.usage.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.usage.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.simulator.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.simulator.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/343ea609/packaging/centos7/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index b99d950d8..8d2ddc4 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -363,6 +363,10 @@ if [ "$1" == "1" ] ; then /usr/bin/systemctl on cloudstack-management > /dev/null 2>&1 || true fi +grep "db.cloud.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.cloud.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.usage.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.usage.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties +grep "db.simulator.driver=jdbc:mysql" /etc/cloudstack/management/db.properties > /dev/null|| echo "db.simulator.driver=jdbc:mysql" >> /etc/cloudstack/management/db.properties + if [ ! -f %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/vhd-util ] ; then echo Please download vhd-util from http://download.cloud.com.s3.amazonaws.com/tools/vhd-util and put it in echo %{_datadir}/cloudstack-common/scripts/vm/hypervisor/xenserver/