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

Develop catapult

VERSION.yml

@@ -1 +1 @@
-version: 1.9.0
+version: 1.9.1

provisioners/redhat/apache.sh

@@ -350,11 +350,8 @@ echo -e "\n==> completed in ($(($end - $start)) seconds)"
 
 echo -e "\n\n\n==> Restarting Apache"
 start=$(date +%s)
-sudo apachectl graceful
-# sometimes there are zombie processes left over, httpd graceful cleans this up properly? (service httpd only supports start|stop|restart)
-sudo service httpd graceful
-sudo service httpd configtest
-sudo systemctl is-active httpd.service
+sudo systemctl reload httpd.service
+sudo systemctl status httpd.service
 end=$(date +%s)
 echo -e "\n==> completed in ($(($end - $start)) seconds)"
 

provisioners/redhat/modules/iptables.sh

@@ -82,5 +82,3 @@ fi
 sudo iptables --policy INPUT DROP
 # output the iptables
 sudo iptables --list
-# persist the iptables rules and policies
-sudo /sbin/service iptables save