From 4282259ded9abc758dd01a92f50b8d85f38f30fc Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Fri, 20 Jun 2014 15:24:26 +0200
Subject: [PATCH] uprava funkce pro update souboru warden-watchdog.conf
---
src/warden-server/sh/update.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/warden-server/sh/update.sh b/src/warden-server/sh/update.sh
index 2c47f23..30d76c9 100755
--- a/src/warden-server/sh/update.sh
+++ b/src/warden-server/sh/update.sh
@@ -299,13 +299,11 @@ doTemplate \
# update wardenWatchdog configuration file
echo -n "Updating Warden Watchdog configuration file ... "
-hostname=$(getConfValue "$watchdog_conf" hostname)
-contact=$(getConfValue "$watchdog_conf" contact)
-email_subject=$(getConfValue "$warden_conf" email_subject)
-email_server_conf=$(getConfValue "$warden_conf" email_server_conf)
+domain_name=$(getConfValue "$watchdog_conf" DOMAIN_NAME)
+email_subject=$(getConfValue "$warden_conf" EMAIL_SUBJECT)
+email_server_conf=$(getConfValue "$warden_conf" EMAIL_SERVER_CONF)
doTemplate \
- _HOSTNAME_ "$hostname" \
- _CONTACT_ "$contact" \
+ _DOMAIN_NAME_ "$domain_name" \
_EMAIL_SUBJECT_ "$email_subject" \
_EMAIL_SERVER_CONF_ "$email_server_conf" \
< $watchdog_conf_tmpl \
--
GitLab