mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
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>
This commit is contained in:
parent
4af82bbc5c
commit
9c067c0496
2
debian/cloudstack-management.postinst
vendored
2
debian/cloudstack-management.postinst
vendored
@ -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}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user