Merge branch 'master' of https://github.com/fusionpbx/fusionpbx-scripts

Conflicts:
	install/ubuntu/install_fusionpbx.sh

install/ubuntu/install_fusionpbx.sh

@@ -81,8 +81,10 @@ FPBXBRANCH="http://fusionpbx.googlecode.com/svn/branches/dev/fusionpbx"
 
 FSGIT=https://freeswitch.org/stash/scm/fs/freeswitch.git
 
-#FSSTABLE=true
+FSSTABLE=true
+#FSSTABLE=file
 #FSStableVer="tags/v1.4.23"
+#FSStablefile=freeswitch-1.4.23
 
 FSSTABLE=file
 FSStablefile=freeswitch-1.4.23
@@ -1921,7 +1923,13 @@ DELIM
 	#should see log lines such as:
 	#2011-02-13 06:37:59,889 fail2ban.filter : INFO   Log rotation detected for /usr/local/freeswitch/log/freeswitch.log
 	/etc/init.d/freeswitch start
-	/etc/init.d/fail2ban restart
+	
+	if [ $DISTRO == "jessie" ]; then
+		sleep 5
+		/bin/systemctl restart fail2ban.service
+	else 
+		/etc/init.d/fail2ban restart
+	fi
 
 	/bin/echo "     fail2ban for ssh enabled by default"
 	/bin/echo "     Default is 3 failures before your IP gets blocked for 600 seconds"
@@ -2711,7 +2719,13 @@ DELIM
 	#/etc/init.d/freeswitch start
 	/bin/echo "Setting up Fail2Ban for FusionPBX"
 	fusionfail2ban
-	/etc/init.d/fail2ban restart
+	
+	if [ $DISTRO == "jessie" ]; then
+		sleep 5
+		/bin/systemctl restart fail2ban.service
+	else 
+		/etc/init.d/fail2ban restart
+	fi
 
 	/bin/echo
 	/bin/echo