uprava dirname; pridano zjisteni a update struktury VALID_STRINGS,...

uprava dirname; pridano zjisteni a update struktury VALID_STRINGS, SQL_PRECONDITION, SQL_QUERIES a SQL_POSTCONDITION

src/warden-server/sh/update.sh

@@ -219,7 +219,7 @@ paramsChck
 err="/tmp/warden-err"
 backup="/tmp/warden-server-backup"
 hostname=$(hostname -f || echo "unspecified.server")
-dirname=${0%/*}
+dirname=${0%/*}/..
 doc="${basedir}/doc"
 etc="${basedir}/etc"
 server_conf="${etc}/warden-server.conf"
@@ -231,7 +231,6 @@ watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl.update"
 package_version=$(<"${dirname}/etc/package_version")
 manifest="${dirname}/doc/MANIFEST"
 
-
 echo
 echo "------------------------- Dependencies check-in -------------------------"
 
@@ -266,6 +265,7 @@ db_user=$(getConfValue "$server_conf" DB_USER)
 db_pass=$(getConfValue "$server_conf" DB_PASS)
 db_host=$(getConfValue "$server_conf" DB_HOST)
 max_events_limit=$(getConfValue "$server_conf" MAX_EVENTS_LIMIT)
+valid_strings=$(perl -e "use perlCommon; perlCommon::getConfHash(\"$server_conf\");")
 doTemplate \
         _BASEDIR_		"$basedir" \
         _SYSLOG_		"$syslog" \
@@ -276,6 +276,7 @@ doTemplate \
         _DB_PASS_		"$db_pass" \
         _DB_HOST_		"$db_host" \
         _MAX_EVENTS_LIMIT_	"$max_events_limit" \
+        _VALID_STRINGS_		"$valid_strings" \
         < $server_conf_tmpl \
         > $server_conf && echo "OK" || errClean
 
@@ -302,10 +303,16 @@ echo -n "Updating Warden Watchdog configuration file ... "
 domain_name=$(getConfValue "$watchdog_conf" DOMAIN_NAME)
 email_subject=$(getConfValue "$warden_conf" EMAIL_SUBJECT)
 email_server_conf=$(getConfValue "$warden_conf" EMAIL_SERVER_CONF)
+sql_precondition=$(perl -e "use perlCommon; perlCommon::getConfArrayPre(\"$watchdog_conf\");")
+sql_queries=$(perl -e "use perlCommon; perlCommon::getConfArrayQueries(\"$watchdog_conf\");")
+sql_postcondition=$(perl -e "use perlCommon; perlCommon::getConfArrayPost(\"$watchdog_conf\");")
 doTemplate \
         _DOMAIN_NAME_		"$domain_name" \
         _EMAIL_SUBJECT_		"$email_subject" \
         _EMAIL_SERVER_CONF_	"$email_server_conf" \
+        _SQL_PRECONDITION_	"$sql_precondition" \
+        _SQL_QUERIES_		"$sql_queries" \
+        _SQL_POSTCONDITION_	"$sql_postcondition" \
         < $watchdog_conf_tmpl \
         > $watchdog_conf && echo "OK" || errClean