From cddf69c0f8ca165a278c10653a9fe753f101665a Mon Sep 17 00:00:00 2001
From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com>
Date: Sun, 23 Aug 2020 12:34:38 +0200
Subject: [PATCH] Usage-server update message improvement (#4278)

* Update cloud.spec

* Update cloud.spec

* Update cloudstack-usage.postinst
---
 debian/cloudstack-usage.postinst | 2 ++
 packaging/centos7/cloud.spec     | 4 ++--
 packaging/centos8/cloud.spec     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst
index e51a305dcc3..fc4a46b4eb7 100755
--- a/debian/cloudstack-usage.postinst
+++ b/debian/cloudstack-usage.postinst
@@ -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
@@ -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
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index e6eb4e3ab98..aa90a435a34 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -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
diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec
index ac515cd6ec8..c30702f04db 100644
--- a/packaging/centos8/cloud.spec
+++ b/packaging/centos8/cloud.spec
@@ -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