You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/06/05 13:31:05 UTC
[2/2] git commit: updated refs/heads/master to 0a9b9f7
CLOUDSTACK-2758: touch file for tomcat6 package change CVS 2013-1976
catalina.out must be prepared by package installation.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/78196384
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/78196384
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/78196384
Branch: refs/heads/master
Commit: 78196384ae905ddf01b1b2f76b9d397aa4117482
Parents: 11a25b3
Author: Hiroaki KAWAI <ka...@stratosphere.co.jp>
Authored: Tue Jun 4 12:41:09 2013 +0900
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Wed Jun 5 17:00:47 2013 +0530
----------------------------------------------------------------------
client/tomcatconf/classpath.conf.in | 8 --------
packaging/centos63/cloud.spec | 3 +++
2 files changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78196384/client/tomcatconf/classpath.conf.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index f2aeeba..3ae0fb4 100644
--- a/client/tomcatconf/classpath.conf.in
+++ b/client/tomcatconf/classpath.conf.in
@@ -36,11 +36,3 @@ done
export CLASSPATH
PATH=/sbin:/usr/sbin:$PATH
export PATH
-
-#catalina.out owned by `cloud` not `root`
-if [ ! -f $TOMCAT_LOG ]; then
- touch $TOMCAT_LOG
- chown $TOMCAT_USER:$TOMCAT_USER $TOMCAT_LOG
-else
- chown $TOMCAT_USER:$TOMCAT_USER $TOMCAT_LOG
-fi
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/78196384/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 83ccae8..1f112dd 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -216,6 +216,8 @@ ln -sf /var/log/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-manageme
ln -sf /var/cache/%{name}/management/temp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/temp
ln -sf /var/cache/%{name}/management/work ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/work
+/bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management/catalina.out
+
install -D client/target/utilities/bin/cloud-migrate-databases ${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases
install -D client/target/utilities/bin/cloud-set-guest-password ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password
install -D client/target/utilities/bin/cloud-set-guest-sshkey ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-sshkey
@@ -519,6 +521,7 @@ fi
%dir %attr(0770,root,root) %{_localstatedir}/log/%{name}-management
%{_defaultdocdir}/%{name}-management-%{version}/LICENSE
%{_defaultdocdir}/%{name}-management-%{version}/NOTICE
+%attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out
%files agent
%attr(0755,root,root) %{_bindir}/%{name}-setup-agent