From 9c067c0496ef9671c8c0e46b6d3722aa460ac352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Fri, 10 Nov 2017 15:29:59 +0100 Subject: [PATCH] CLOUDSTACK-10137: Only link log4j if not already present (#2316) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use ln -sf to add link log4j.xml. Signed-off-by: Marc-Aurèle Brothier --- 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 b2a1c900a73..2cc3b9b7b53 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 682bda97de2..1a11a15cb8f 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 c8d0ebc0fe0..10b9c3ed908 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