You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/16 20:34:20 UTC
[15/46] git commit: updated refs/heads/internallb to b7709b8
Fix a problem where usage server did not start because of a missing db.properties and log4j-cloud.xml
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ae16f332
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ae16f332
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ae16f332
Branch: refs/heads/internallb
Commit: ae16f332132a5eb1e3ff85a0c435dbe25a1d6299
Parents: e7090e6
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Apr 15 15:00:47 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Apr 15 15:02:47 2013 +0200
----------------------------------------------------------------------
packaging/centos63/cloud.spec | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ae16f332/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 9ce46c9..c2c6fe7 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -278,6 +278,8 @@ cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib
install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar
+install -D usage/target/transformed/db.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/db.properties
+install -D usage/target/transformed/log4j-cloud_usage.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/log4j-cloud.xml
cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/
install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/%{name}-usage
mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/
@@ -438,6 +440,20 @@ if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then
mv %{_sysconfdir}/cloud.rpmsave/agent/agent.properties %{_sysconfdir}/cloud.rpmsave/agent/agent.properties.rpmsave
fi
+%post usage
+if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
+ echo Replacing db.properties with management server db.properties
+ rm -f %{_sysconfdir}/%{name}/usage/db.properties
+ ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
+fi
+
+if [ -f "%{_sysconfdir}/%{name}/management/log4j-cloud.xml" ]; then
+ echo Replacing log4j-cloud.xml with management server log4j-cloud.xml
+ rm -f %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
+ ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
+fi
+
+
#%post awsapi
#if [ -d "%{_datadir}/%{name}-management" ] ; then
# ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080
@@ -533,7 +549,8 @@ fi
%attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar
%attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar
%dir /var/log/%{name}/usage
-%dir %{_sysconfdir}/%{name}/usage
+%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/db.properties
+%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/log4j-cloud.xml
%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE
%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE