pridano generovani konfiguracniho souboru pro wardenWatchdog ze sablony;...

pridano generovani konfiguracniho souboru pro wardenWatchdog ze sablony; zprehledneni kodu; uprava mazani zkopirovanych sablon konfiguracnich souboru pri instalaci

src/warden-server/sh/install.sh

@@ -23,7 +23,7 @@ usage()
 	echo "-h                        print this help"
 	echo "-V                        print script version number and exit"
 	echo
-	echo "Example: # ./${0##*/} -d /opt -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/tcs-ca-bundle.pem -s /usr/local/bin"
+	echo "Example: $ ./${0##*/} -d /opt -k /etc/ssl/private/server.key -c /etc/ssl/certs/server.pem -a /etc/ssl/certs/tcs-ca-bundle.pem -s /usr/local/bin"
 	echo
 	echo "For more information about installation process, see README file (section Installation)."
 	echo
@@ -90,7 +90,7 @@ paramsChck()
 oldPackageChck()
 {
 	echo -n "Checking previous Warden server installation ... "
-	old_package_version_file=`find $basedir -name package_version`
+	old_package_version_file=$(find $basedir -name package_version)
 	if [ -f "$old_package_version_file" ]; then
 		echo "FAILED!"
 		echo
@@ -118,7 +118,7 @@ perlChck()
 
 modulesChck()
 {
-	sed '/^use [A-Z]/!d; /Warden/d' `find "${dirname}" -type f` 2>/dev/null | cut -f 2 -d " " | sed 's/;//' | sort -u > "$modules_file"
+	sed '/^use [A-Z]/!d; /Warden/d' $(find "${dirname}" -type f) 2>/dev/null | cut -f 2 -d " " | sed 's/;//' | sort -u > "$modules_file"
 	for module in $(<"$modules_file");
 	do
 		echo -n "Checking $module module ... "
@@ -138,7 +138,7 @@ createWardenDir()
 		fi
 	done
 	ln -s "${sh}/uninstall.sh" "$basedir"
-	rm -f "${etc}/${server_conf_tmpl##*/}" "${etc}/${apache_conf_tmpl##*/}"
+	rm -f "${etc}/"*.tmpl
 	echo "OK"
 }
 
@@ -192,6 +192,7 @@ paramsChck
 # set variables
 err="/tmp/warden-err"
 modules_file="/tmp/warden-modules.txt"
+hostname=$(hostname -f || echo "unspecified.server")
 dirname=${0%/*}
 bin="${basedir}/bin"
 lib="${basedir}/lib"
@@ -200,8 +201,10 @@ etc="${basedir}/etc"
 sh="${basedir}/sh"
 server_conf="${etc}/warden-server.conf"
 apache_conf="${etc}/warden-apache.conf"
+watchdog_conf="${etc}/warden-watchdog.conf"
 server_conf_tmpl="${dirname}/etc/warden-server.conf.tmpl"
 apache_conf_tmpl="${dirname}/etc/warden-apache.conf.tmpl"
+watchdog_conf_tmpl="${dirname}/etc/warden-watchdog.conf.tmpl"
 package_version=$(< "${dirname}/etc/package_version")
 
 echo
@@ -239,6 +242,13 @@ doTemplate \
         < $apache_conf_tmpl \
         > $apache_conf && echo "OK" || errClean
 
+# create wardenWatchdog configuration file
+echo -n "Creating wardenWatchdog configuration file ... "
+doTemplate \
+        _HOSTNAME_	"$hostname" \
+        < $watchdog_conf_tmpl \
+        > $watchdog_conf && echo "OK" || errClean
+
 # crate symlinks from warden server bin to user path if -s option is set
 [[ ! -z $symbin ]] && [[ -d $symbin ]] && [[ -w $symbin ]] && createSymlinks