cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [cloudstack] branch master updated: CLOUDSTACK-10137: Only link log4j if not already present (#2316)
Date Fri, 10 Nov 2017 14:30:08 GMT
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new 9c067c0  CLOUDSTACK-10137: Only link log4j if not already present (#2316)
9c067c0 is described below

commit 9c067c0496ef9671c8c0e46b6d3722aa460ac352
Author: Marc-Aurèle Brothier <m@brothier.org>
AuthorDate: Fri Nov 10 15:29:59 2017 +0100

    CLOUDSTACK-10137: Only link log4j if not already present (#2316)
    
    Use ln -sf to add link log4j.xml.
    
    Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
---
 debian/cloudstack-management.postinst | 2 +-
 packaging/centos63/cloud.spec         | 2 +-
 packaging/centos7/cloud.spec          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index b2a1c90..2cc3b9b 100755
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -57,7 +57,7 @@ if [ "$1" = configure ]; then
     chgrp cloud ${CONFDIR}/${DBPROPS}
     chown -R cloud:cloud /var/log/cloudstack/management
 
-    ln -s ${CONFDIR}/log4j-cloud.xml ${CONFDIR}/log4j.xml
+    ln -sf ${CONFDIR}/log4j-cloud.xml ${CONFDIR}/log4j.xml
 
     # 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}
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 682bda9..1a11a15 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -295,7 +295,7 @@ do
   cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-ln -s log4j-cloud.xml  ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
+ln -sf log4j-cloud.xml  ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
 
 install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index c8d0ebc..10b9c3e 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -265,7 +265,7 @@ do
   cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
 done
 
-ln -s log4j-cloud.xml  ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
+ln -sf log4j-cloud.xml  ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/log4j.xml
 
 install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py
 install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Mime
View raw message