mirror of https://github.com/apache/cloudstack.git
CLOUDSTACK-4533: fix two usage issues (db.properties and log4j-cloud.xml)
(1) Replacing db.properties with management server db.properties (2) Rename log4j-cloud_usage.xml to log4j-cloud.xml
This commit is contained in:
parent
dfee47e3b6
commit
fb97e8e617
|
|
@ -27,11 +27,17 @@ case "$1" in
|
|||
cp -a /etc/cloud/management/db.properties /etc/cloudstack/usage/db.properties
|
||||
fi
|
||||
|
||||
# Replacing db.properties with management server db.properties
|
||||
if [ -f "/etc/cloudstack/management/db.properties" ]; then
|
||||
rm -rf /etc/cloudstack/usage/db.properties
|
||||
ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties
|
||||
fi
|
||||
|
||||
# We also retain the log4j configuration
|
||||
if [ -f "/etc/cloud/usage/log4j-cloud_usage.xml" ]; then
|
||||
cp -a /etc/cloud/usage/log4j-cloud_usage.xml /etc/cloudstack/usage/log4j-cloud_usage.xml
|
||||
if [ -f "/etc/cloud/usage/log4j-cloud.xml" ]; then
|
||||
cp -a /etc/cloud/usage/log4j-cloud.xml /etc/cloudstack/usage/log4j-cloud.xml
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -145,7 +145,8 @@ install:
|
|||
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-usage/plugins
|
||||
install -D usage/target/cloud-usage-$(VERSION)-SNAPSHOT.jar $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/$(PACKAGE)-usage.jar
|
||||
install -D usage/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-usage/lib/
|
||||
cp usage/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
|
||||
cp usage/target/transformed/db.properties $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/
|
||||
cp usage/target/transformed/log4j-cloud_usage.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/usage/log4j-cloud.xml
|
||||
install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage
|
||||
|
||||
# cloudstack-awsapi
|
||||
|
|
|
|||
Loading…
Reference in New Issue