Skip to content
Snippets Groups Projects
Commit 74b30230 authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

bugfixes: odchytavani chyby pri vytvareni adresare Warden serveru; vytvareni... 

bugfixes: odchytavani chyby pri vytvareni adresare Warden serveru; vytvareni uninstall.sh jako symlinku do adresare sh; prejmenovani promennych sablon konfiguracnich souboru; pridana kontrola dostupnosti konfiguracnich souboru a jejich pripadne vytvoreni nebo update
parent b6c1fbbe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/warden-server/sh/update.sh
+ 113
− 62
View file @ 74b30230
...@@ -149,7 +149,7 @@ modulesChck() ...@@ -149,7 +149,7 @@ modulesChck()
backup() backup()
{ {
echo -n "Making Warden server backup ... " echo -n "Making Warden server backup ... "
mkdir "$backup" mkdir "$backup" 2> "$err" || err
if cp -R "${basedir}/"* "$backup" 2> "$err"; then if cp -R "${basedir}/"* "$backup" 2> "$err"; then
echo "OK" echo "OK"
else else
...@@ -167,6 +167,8 @@ updateWardenDir() ...@@ -167,6 +167,8 @@ updateWardenDir()
[[ ! -d "$dir" ]] && mkdir -p "$dir" [[ ! -d "$dir" ]] && mkdir -p "$dir"
cp "$file" "${basedir}/$file" 2> "$err" || errClean cp "$file" "${basedir}/$file" 2> "$err" || errClean
done done
rm -f "${basedir}/uninstall.sh" 2> /dev/null
ln -s "${sh}/uninstall.sh" "$basedir"
echo "OK" echo "OK"
} }
...@@ -189,7 +191,7 @@ doTemplate() ...@@ -189,7 +191,7 @@ doTemplate()
cleanOldFiles() cleanOldFiles()
{ {
echo -n "Cleaning old files ... " echo -n "Removing old package files ... "
rm -f "${etc}/warden-client.conf" 2> /dev/null rm -f "${etc}/warden-client.conf" 2> /dev/null
rm -f "${doc}/warden20to21.patch" 2> /dev/null rm -f "${doc}/warden20to21.patch" 2> /dev/null
rm -f "${lib}/WardenConf.pm" 2> /dev/null rm -f "${lib}/WardenConf.pm" 2> /dev/null
...@@ -246,12 +248,16 @@ hostname=$(hostname -f || echo "unspecified.server") ...@@ -246,12 +248,16 @@ hostname=$(hostname -f || echo "unspecified.server")
dirname=${0%/*} dirname=${0%/*}
doc="${basedir}/doc" doc="${basedir}/doc"
etc="${basedir}/etc" etc="${basedir}/etc"
sh="${basedir}/sh"
server_conf="${etc}/warden-server.conf" server_conf="${etc}/warden-server.conf"
apache_conf="${etc}/warden-apache.conf" apache_conf="${etc}/warden-apache.conf"
watchdog_conf="${etc}/warden-watchdog.conf" watchdog_conf="${etc}/warden-watchdog.conf"
server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl.update" server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl"
apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl.update" server_conf_tmpl_update="${dirname}/etc/warden-server.conf.tmpl.update"
watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl.update" apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
apache_conf_tmpl_update="${dirname}/etc/warden-apache.conf.tmpl.update"
watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl"
watchdog_conf_tmpl_update="${dirname}/etc/warden-watchdog.conf.tmpl.update"
package_version=$(<"${dirname}/etc/package_version") package_version=$(<"${dirname}/etc/package_version")
manifest="${dirname}/doc/MANIFEST" manifest="${dirname}/doc/MANIFEST"
...@@ -281,65 +287,109 @@ backup ...@@ -281,65 +287,109 @@ backup
updateWardenDir || exit 1 updateWardenDir || exit 1
# update server configuration file # update server configuration file
echo -n "Updating Warden server configuration file ... " echo -n "Checking Warden server configuration file ... "
syslog=$(getConfValue "$server_conf" SYSLOG) if [[ -r "$server_conf" ]]; then
syslog_verbose=$(getConfValue "$server_conf" SYSLOG_VERBOSE) echo "OK"
syslog_facility=$(getConfValue "$server_conf" SYSLOG_FACILITY) echo -n " -> Updating Warden server configuration file ... "
db_name=$(getConfValue "$server_conf" DB_NAME) syslog=$(getConfValue "$server_conf" SYSLOG)
db_user=$(getConfValue "$server_conf" DB_USER) syslog_verbose=$(getConfValue "$server_conf" SYSLOG_VERBOSE)
db_pass=$(getConfValue "$server_conf" DB_PASS) syslog_facility=$(getConfValue "$server_conf" SYSLOG_FACILITY)
db_host=$(getConfValue "$server_conf" DB_HOST) db_name=$(getConfValue "$server_conf" DB_NAME)
max_events_limit=$(getConfValue "$server_conf" MAX_EVENTS_LIMIT) db_user=$(getConfValue "$server_conf" DB_USER)
valid_strings=$(perl -e "use updateCommon; updateCommon::getConfHash(\"$server_conf\");") db_pass=$(getConfValue "$server_conf" DB_PASS)
doTemplate \ db_host=$(getConfValue "$server_conf" DB_HOST)
_BASEDIR_ "$basedir" \ max_events_limit=$(getConfValue "$server_conf" MAX_EVENTS_LIMIT)
_SYSLOG_ "$syslog" \ valid_strings=$(perl -e "use updateCommon; updateCommon::getConfHash(\"$server_conf\");")
_SYSLOG_VERBOSE_ "$syslog_verbose" \ doTemplate \
_SYSLOG_FACILITY_ "$syslog_facility" \ _BASEDIR_ "$basedir" \
_DB_NAME_ "$db_name" \ _SYSLOG_ "$syslog" \
_DB_USER_ "$db_user" \ _SYSLOG_VERBOSE_ "$syslog_verbose" \
_DB_PASS_ "$db_pass" \ _SYSLOG_FACILITY_ "$syslog_facility" \
_DB_HOST_ "$db_host" \ _DB_NAME_ "$db_name" \
_MAX_EVENTS_LIMIT_ "$max_events_limit" \ _DB_USER_ "$db_user" \
_VALID_STRINGS_ "$valid_strings" \ _DB_PASS_ "$db_pass" \
< $server_conf_tmpl \ _DB_HOST_ "$db_host" \
> $server_conf && echo "OK" || errClean _MAX_EVENTS_LIMIT_ "$max_events_limit" \
_VALID_STRINGS_ "$valid_strings" \
< $server_conf_tmpl_update \
> $server_conf && echo "OK" || errClean
else
echo "FAILED!"
echo -n " -> Creating Warden server configuration file ... "
doTemplate \
_BASEDIR_ "$basedir" \
< $server_conf_tmpl \
> $server_conf && echo "OK" || errClean
fi
# update Apache configuration file # update Apache configuration file
echo -n "Updating Apache configuration file ... " echo -n "Checking Apache configuration file ... "
cert_file_tmp=`fgrep SSLCertificateFile $apache_conf` if [[ -r "$apache_conf" ]]; then
key_file_tmp=`fgrep SSLCertificateKeyFile $apache_conf` echo "OK"
ca_file_tmp=`fgrep SSLCACertificateFile $apache_conf` echo -n " -> Updating Apache configuration file ... "
lib_tmp=`fgrep PerlSwitches $apache_conf` cert_file_tmp=`fgrep SSLCertificateFile $apache_conf`
cert_file=${cert_file_tmp##*" "} key_file_tmp=`fgrep SSLCertificateKeyFile $apache_conf`
key_file=${key_file_tmp##*" "} ca_file_tmp=`fgrep SSLCACertificateFile $apache_conf`
ca_file=${ca_file_tmp##*" "} lib_tmp=`fgrep PerlSwitches $apache_conf`
lib=${lib_tmp##*" "} cert_file=${cert_file_tmp##*" "}
doTemplate \ key_file=${key_file_tmp##*" "}
_CERT_FILE_ "$cert_file" \ ca_file=${ca_file_tmp##*" "}
_KEY_FILE_ "$key_file" \ lib=${lib_tmp##*" "}
_CA_FILE_ "$ca_file" \ doTemplate \
_LIB_ "$lib" \ _CERT_FILE_ "$cert_file" \
< $apache_conf_tmpl \ _KEY_FILE_ "$key_file" \
> $apache_conf && echo "OK" || errClean _CA_FILE_ "$ca_file" \
_LIB_ "$lib" \
< $apache_conf_tmpl_update \
> $apache_conf && echo "OK" || errClean
else
echo "FAILED!"
echo -n " -> Creating Apache configuration file ... "
cert_file="unspecified.cert"
key_file="unspecified.key"
ca_file="unspecified.ca_cert"
lib="unspecified.lib_path"
doTemplate \
_CERT_FILE_ "$cert_file" \
_KEY_FILE_ "$key_file" \
_CA_FILE_ "$ca_file" \
_LIB_ "$lib" \
< $apache_conf_tmpl \
> $apache_conf && echo "OK" || errClean
fi
# update wardenWatchdog configuration file # update wardenWatchdog configuration file
echo -n "Updating Warden Watchdog configuration file ... " echo -n "Checking Warden Watchdog configuration file ... "
domain_name=$(getConfValue "$watchdog_conf" DOMAIN_NAME) if [[ -r "$watchdog_conf" ]]; then
email_subject=$(getConfValue "$warden_conf" EMAIL_SUBJECT) echo "OK"
email_server_conf=$(getConfValue "$warden_conf" EMAIL_SERVER_CONF) echo -n " -> Updating Warden Watchdog configuration file ... "
sql_precondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPre(\"$watchdog_conf\");") domain_name=$(getConfValue "$watchdog_conf" DOMAIN_NAME)
sql_queries=$(perl -e "use updateCommon; updateCommon::getConfArrayQueries(\"$watchdog_conf\");") email_subject=$(getConfValue "$warden_conf" EMAIL_SUBJECT)
sql_postcondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPost(\"$watchdog_conf\");") email_server_conf=$(getConfValue "$warden_conf" EMAIL_SERVER_CONF)
doTemplate \ sql_precondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPre(\"$watchdog_conf\");")
_DOMAIN_NAME_ "$domain_name" \ sql_queries=$(perl -e "use updateCommon; updateCommon::getConfArrayQueries(\"$watchdog_conf\");")
_EMAIL_SUBJECT_ "$email_subject" \ sql_postcondition=$(perl -e "use updateCommon; updateCommon::getConfArrayPost(\"$watchdog_conf\");")
_EMAIL_SERVER_CONF_ "$email_server_conf" \ doTemplate \
_SQL_PRECONDITION_ "$sql_precondition" \ _DOMAIN_NAME_ "$domain_name" \
_SQL_QUERIES_ "$sql_queries" \ _EMAIL_SUBJECT_ "$email_subject" \
_SQL_POSTCONDITION_ "$sql_postcondition" \ _EMAIL_SERVER_CONF_ "$email_server_conf" \
< $watchdog_conf_tmpl \ _SQL_PRECONDITION_ "$sql_precondition" \
> $watchdog_conf && echo "OK" || errClean _SQL_QUERIES_ "$sql_queries" \
_SQL_POSTCONDITION_ "$sql_postcondition" \
< $watchdog_conf_tmpl_update \
> $watchdog_conf && echo "OK" || errClean
else
echo "FAILED!"
echo -n " -> Creating Warden Watchdog configuration file ... "
domain_name=$(hostname -f || echo "unspecified.server")
contact="unspecified.contact"
doTemplate \
_DOMAIN_NAME_ "$domain_name" \
_CONTACT_ "$contact" \
< $watchdog_conf_tmpl \
> $watchdog_conf && echo "OK" || errClean
fi
# cleaning of files from old package - depend on package version # cleaning of files from old package - depend on package version
cleanOldFiles cleanOldFiles
...@@ -351,7 +401,7 @@ createManifest ...@@ -351,7 +401,7 @@ createManifest
[[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && createSymlinks [[ ! -z "$symbin" ]] && [[ -d "$symbin" ]] && [[ -w "$symbin" ]] && createSymlinks
echo echo
echo "Please check updated configuration files:" echo "Please check updated/created configuration files:"
echo " - $server_conf" echo " - $server_conf"
echo " - $server_conf" echo " - $server_conf"
echo " - $watchdog_conf" echo " - $watchdog_conf"
...@@ -364,6 +414,7 @@ echo "Please follow post-update steps in ${doc}/UPDATE!" ...@@ -364,6 +414,7 @@ echo "Please follow post-update steps in ${doc}/UPDATE!"
echo echo
# cleanup section # cleanup section
rm -f "$err" "$backup" rm -f "$err"
rm -rf "$backup"
exit 0 exit 0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment