Updated Branches: refs/heads/master 9cf5f9d78 -> 2234e043e
Summary: update packaging Change some paths to use the new cloudstack name Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2234e043 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2234e043 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2234e043 Branch: refs/heads/master Commit: 2234e043e2c900bd13db8893437c712c5d90fd3e Parents: 9cf5f9d Author: Hugo Trippaers <[email protected]> Authored: Tue Feb 5 10:46:51 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Tue Feb 5 10:47:42 2013 +0100 ---------------------------------------------------------------------- client/bindir/cloud-setup-management.in | 2 +- packaging/centos63/cloud-management.sysconfig | 2 +- packaging/centos63/cloud.spec | 2 ++ packaging/centos63/replace.properties | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2234e043/client/bindir/cloud-setup-management.in ---------------------------------------------------------------------- diff --git a/client/bindir/cloud-setup-management.in b/client/bindir/cloud-setup-management.in index ca1327a..aa9a46b 100755 --- a/client/bindir/cloud-setup-management.in +++ b/client/bindir/cloud-setup-management.in @@ -24,7 +24,7 @@ from cloudutils.globalEnv import globalEnv from cloudutils.serviceConfigServer import cloudManagementConfig from optparse import OptionParser if __name__ == '__main__': - initLoging("/var/log/cloud/setupManagement.log") + initLoging("@MSLOGDIR@/setupManagement.log") glbEnv = globalEnv() parser = OptionParser() http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2234e043/packaging/centos63/cloud-management.sysconfig ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-management.sysconfig b/packaging/centos63/cloud-management.sysconfig index 15df8cd..cbc8b8b 100644 --- a/packaging/centos63/cloud-management.sysconfig +++ b/packaging/centos63/cloud-management.sysconfig @@ -18,6 +18,6 @@ # This file is loaded in /etc/init.d/vmopsmanagement # ATM we only do two things here: -dummy=1 ; export TOMCAT_CFG=/etc/cloud/management/tomcat6.conf ; . /etc/cloud/management/tomcat6.conf +dummy=1 ; export TOMCAT_CFG=/etc/cloudstack/management/tomcat6.conf ; . /etc/cloudstack/management/tomcat6.conf #-------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2234e043/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 18fac49..8a29687 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -193,6 +193,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management +mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/awsapi mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management # Specific for tomcat @@ -316,6 +317,7 @@ fi %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/agent +%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/awsapi %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %config(noreplace) %{_sysconfdir}/%{name}/management %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2234e043/packaging/centos63/replace.properties ---------------------------------------------------------------------- diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties index e58e19b..f7e5748 100644 --- a/packaging/centos63/replace.properties +++ b/packaging/centos63/replace.properties @@ -43,8 +43,8 @@ LOCKDIR=/var/lock MSCLASSPATH= MSCONF=/etc/cloudstack/management MSENVIRON=/usr/share/cloudstack-management -MSLOG=/var/log/cloudstack-management/management-server.log -MSLOGDIR=/var/log/cloudstack-management/ +MSLOG=/var/log/cloudstack/management/management-server.log +MSLOGDIR=/var/log/cloudstack/management/ MSMNTDIR=/var/lib/cloud/mnt MSUSER=cloud PIDDIR=/var/run
