Skip to content

Usage-server update message improvement #4278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 3 commits into from
Aug 23, 2020
Merged

Usage-server update message improvement #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e08dff
Update cloud.spec
andrijapanicsb Aug 21, 2020
62214e0
Update cloud.spec
andrijapanicsb Aug 21, 2020
b3eacaf
Update cloudstack-usage.postinst
andrijapanicsb Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions debian/cloudstack-usage.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ case "$1" in

# Linking usage server db.properties to management server db.properties
if [ -f "/etc/cloudstack/management/db.properties" ]; then
echo Replacing usage server's db.properties with a link to the management server's db.properties
rm -f /etc/cloudstack/usage/db.properties
ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties
fi
Expand All @@ -35,6 +36,7 @@ case "$1" in

# Replacing key with management server key
if [ -f "/etc/cloudstack/management/key" ]; then
echo Replacing usage server's key with a link to the management server's key
rm -f /etc/cloudstack/usage/key
ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key
fi
Expand Down
4 changes: 2 additions & 2 deletions packaging/centos7/cloud.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,14 +465,14 @@ fi

%post usage
if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
echo Replacing db.properties with management server db.properties
echo Replacing usage server's db.properties with a link to the management server's db.properties
rm -f %{_sysconfdir}/%{name}/usage/db.properties
ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
/usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
fi

if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
echo Replacing key with management server key
echo Replacing usage server's key with a link to the management server's key
rm -f %{_sysconfdir}/%{name}/usage/key
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
fi
Expand Down
4 changes: 2 additions & 2 deletions packaging/centos8/cloud.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,14 +462,14 @@ fi

%post usage
if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then
echo Replacing db.properties with management server db.properties
echo Replacing usage server's db.properties with a link to the management server's db.properties
rm -f %{_sysconfdir}/%{name}/usage/db.properties
ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties
/usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true
fi

if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then
echo Replacing key with management server key
echo Replacing usage server's key with a link to the management server's key
rm -f %{_sysconfdir}/%{name}/usage/key
ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key
fi
Expand Down