Merge pull request #83 from bebehei/shellcheck

small fixes proposed by shellcheck

content/opt/setup/apache2

@@ -4,7 +4,7 @@ mkdir -p /var/log/apache2
 chown -R www-data:adm /var/log/apache2
 
 # Enable SSL support if certificates are mounted
-if [ -f /etc/apache2/ssl/icinga2.crt -a -f /etc/apache2/ssl/icinga2.key ]; then
+if [ -f /etc/apache2/ssl/icinga2.crt ] && [ -f /etc/apache2/ssl/icinga2.key ]; then
 
 	# If there is no chain needed, we have to generate an empty
 	# file with a single line to interpret it correctly as "no chain"

content/opt/setup/icinga2

@@ -22,7 +22,7 @@ chown -R nagios:root /etc/icinga2
 icinga2 feature enable ido-mysql livestatus compatlog command
 
 #icinga2 API cert - regenerate new private key and certificate when running in a new container
-if [ ! -f /etc/icinga2/pki/$(hostname).key ]; then
+if [ ! -f "/etc/icinga2/pki/$(hostname).key" ]; then
 	icinga2 node setup --master
 fi
 

content/opt/supervisor/apache2_supervisor

@@ -3,6 +3,6 @@
 service apache2 start
 
 # Allow any signal which would kill a process to stop server
-trap "service apache2 stop" HUP INT QUIT ABRT KILL ALRM TERM TSTP
+trap "service apache2 stop" HUP INT QUIT ABRT ALRM TERM TSTP
 
 while pgrep -u www-data apache2 > /dev/null; do sleep 5; done

content/opt/supervisor/icinga2_supervisor

@@ -10,6 +10,6 @@ if [ "${ICINGA2_FEATURE_DIRECTOR}" == "true" ] || [ "${ICINGA2_FEATURE_DIRECTOR}
 fi
 
 # Allow any signal which would kill a process to stop server
-trap "service icinga2 stop" HUP INT QUIT ABRT KILL ALRM TERM TSTP
+trap "service icinga2 stop" HUP INT QUIT ABRT ALRM TERM TSTP
 
 while pgrep -u nagios icinga2 > /dev/null; do sleep 5; done

content/opt/supervisor/mysql_supervisor

@@ -3,6 +3,6 @@
 service mysql start
 
 # Allow any signal which would kill a process to stop server
-trap "service mysql stop" HUP INT QUIT ABRT KILL ALRM TERM TSTP
+trap "service mysql stop" HUP INT QUIT ABRT ALRM TERM TSTP
 
 while pgrep -u mysql mysql > /dev/null; do sleep 5; done