Merge pull request #297 from calcium-machine/develop-catapult

Fallback to native apachectl if systemd fails a reload.

VERSION.yml

@@ -1 +1 @@
-version: 1.10.1
+version: 1.10.2

Vagrantfile

@@ -1245,7 +1245,7 @@ if ["status"].include?(ARGV[0])
   puts "\n[cert signature algorithm]"
   puts " * https://www.openssl.org/docs/apps/ciphers.html"
   puts "\nAvailable websites:".color(Colors::WHITE)
-  puts "".ljust(42) + "[software]".ljust(14) + "[alexa rank, 3m delta]".ljust(24) + "[dev.]".ljust(22) + "[test.]".ljust(22) + "[qc.]".ljust(22) + "[production / cert expiry, signature algorithm, common name]".ljust(80)
+  puts "".ljust(42) + "[software]".ljust(14) + "[alexa rank, 3m delta]".ljust(24) + "[dev.]".ljust(21) + "[test.]".ljust(21) + "[qc.]".ljust(21) + "[production / cert expiry, signature algorithm, common name]"
 
   configuration["websites"].each do |service,data|
     if configuration["websites"]["#{service}"] == nil

provisioners/redhat/apache.sh

@@ -343,6 +343,12 @@ echo -e "\n==> completed in ($(($end - $start)) seconds)"
 echo -e "\n\n\n==> Restarting Apache"
 start=$(date +%s)
 sudo systemctl reload httpd.service
+if [ $? -eq 0 ]; then
+  echo "'sudo systemctl reload httpd.service' was successful"
+else
+  echo "'sudo systemctl reload httpd.service' was unsuccessful, trying 'sudo apachectl -k graceful'"
+  sudo apachectl -k graceful
+fi
 sudo systemctl status httpd.service
 end=$(date +%s)
 echo -e "\n==> completed in ($(($end - $start)) seconds)"