Merge remote-tracking branch 'refs/remotes/fusionpbx/master'

source/getting_started/iptables.rst

@@ -63,12 +63,13 @@ Delete line 2
 Block IP address
 ================
 
-iptables -I INPUT -s 62.210.245.132 -j DROP
+``iptables -I INPUT -s 62.210.245.132 -j DROP``
 
 Save Changes
 ============
 
 Debian / Ubuntu
 
-| `` apt-get install iptables-persistent``
-| `` service iptables-persistent save``
+| ``apt-get install iptables-persistent``
+| ``service iptables-persistent save``
+| ``dpkg-reconfigure iptables-persistent``

source/iptables1.rst

@@ -7,45 +7,26 @@ Basic Rules
 ===========
 
 | ``iptables -A INPUT -i lo -j ACCEPT``
-
 | ``iptables -A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT``
-
 | ``iptables -A INPUT -p tcp --dport 22 -j ACCEPT``
-
 | ``iptables -A INPUT -p tcp --dport 80 -j ACCEPT``
-
 | ``iptables -A INPUT -p tcp --dport 443 -j ACCEPT``
-
 | ``iptables -A INPUT -p tcp --dport 5060 -j ACCEPT``
-
 | ``iptables -A INPUT -p udp --dport 5060 -j ACCEPT``
-
 | ``iptables -A INPUT -p tcp --dport 5080 -j ACCEPT``
-
 | ``iptables -A INPUT -p udp --dport 5080 -j ACCEPT``
-
 | ``iptables -A INPUT -p udp --dport 16384:32768 -j ACCEPT``
-
+| ``iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT``
 | ``iptables -A INPUT -p udp --dport 1194 -j ACCEPT``
-
 | ``iptables -P INPUT DROP``
-
 | ``iptables -P FORWARD DROP``
-
 | ``iptables -P OUTPUT ACCEPT``
-|
-
-ICMP (optional)
-===============
-
-| ``iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT``
 
 Friendly Scanner
 ================
 
 Rules to block not so friendly scanner
 
-|
 | ``iptables -I INPUT -j DROP -p tcp --dport 5060 -m string --string "friendly-scanner" --algo bm``
 | ``iptables -I INPUT -j DROP -p tcp --dport 5080 -m string --string "friendly-scanner" --algo bm``
 | ``iptables -I INPUT -j DROP -p udp --dport 5060 -m string --string "friendly-scanner" --algo bm``
@@ -78,7 +59,6 @@ Save Changes
 
 Debian & Ubuntu
 
-|
 | ``apt-get install iptables-persistent``
 | ``service iptables-persistent save``
 |