pridano generovani nove promenne $contact do warden-watchdog.conf; zmena nazvu...

pridano generovani nove promenne $contact do warden-watchdog.conf; zmena nazvu ziskavanych promennych z warden-watchdog.conf; zmena zdrojoveho konfiguracniho souboru pro ziskavani promennych do konfiguracniho souboru warden-apache.conf

src/warden-server/sh/update.sh

@@ -281,10 +281,10 @@ doTemplate \
 
 # update Apache configuration file
 echo -n "Updating Apache configuration file ... "
-cert_file=$(getConfValue "$apache_conf" CERT_FILE)
-key_file=$(getConfValue "$apache_conf" KEY_FILE)
-ca_file=$(getConfValue "$apache_conf" CA_FILE)
-lib=$(getConfValue "$apache_conf" LIB)
+cert_file=$(getConfValue "$server_conf" CERT_FILE)
+key_file=$(getConfValue "$server_conf" KEY_FILE)
+ca_file=$(getConfValue "$server_conf" CA_FILE)
+lib=$(getConfValue "$server_conf" LIB)
 doTemplate \
         _CERT_FILE_     "$cert_file" \
         _KEY_FILE_      "$key_file" \
@@ -295,11 +295,13 @@ doTemplate \
 
 # update wardenWatchdog configuration file
 echo -n "Updating Warden Watchdog configuration file ... "
-hostname=$(getConfValue "$watchdog_conf" HOSTNAME)
-email_subject=$(getConfValue "$watchdog_conf" EMAIL_SUBJECT)
-email_server_conf=$(getConfValue "$watchdog_conf" EMAIL_SERVER_CONF)
+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)
 doTemplate \
         _HOSTNAME_		"$hostname" \
+        _CONTACT_		"$contact" \
         _EMAIL_SUBJECT_		"$email_subject" \
         _EMAIL_SERVER_CONF_	"$email_server_conf" \
         < $watchdog_conf_tmpl \