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

source/advanced/upgrade.rst

@@ -267,7 +267,10 @@ Version 4.0 to 4.2
 
 8. Goto Advanced > Variables hold_music. Make sure it's value is set as local_stream://default
 
-|
+
+ .. note::
+ 
+  Many of the provisioning templates were updated.  If you use custom provisioning templates you should consider updating them with the new versions. 
 
 Version 3.8 to 4.0
 ^^^^^^^^^^^^^^^^^^

source/getting_started.rst

@@ -20,4 +20,3 @@ Follow the menu to the left and you will have a working PBX in no time. For PDF
   getting_started/installation_recommended_new.rst
   getting_started/register_phones.rst
   getting_started/post_installation.rst
-  iptables.rst

source/getting_started/post_installation.rst

@@ -1,11 +1,8 @@
 *****************
 Post Installation
 *****************
-.. image:: _static/images/logo.png
-        :width: 130pt
-        :align: center
-        :height: 76.5pt
 
+|
 
 After The install is complete please keep the login details from the install in a safe and secure place.  Just in case you need them later.
 

source/iptables1.rst → source/iptables.rst

@@ -4,15 +4,15 @@
    :target: https://github.com/fusionpbx/fusionpbx-docs
 
 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 5060:5069 -j ACCEPT``
+| ``iptables -A INPUT -p udp --dport 5060:5069 -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``
@@ -22,8 +22,9 @@ Basic Rules
 | ``iptables -P FORWARD DROP``
 | ``iptables -P OUTPUT ACCEPT``
 
+
 Friendly Scanner
-================
+~~~~~~~~~~~~~~~~~
 
 Rules to block not so friendly scanner
 
@@ -33,29 +34,37 @@ Rules to block not so friendly scanner
 | ``iptables -I INPUT -j DROP -p udp --dport 5080 -m string --string "friendly-scanner" --algo bm``
 
 Show iptable rules
-==================
+~~~~~~~~~~~~~~~~~~~
 
 | ``sudo iptables -L -v``
 
 Show line numbers
-=================
+~~~~~~~~~~~~~~~~~~
 
 | ``iptables -L -v --line-numbers``
 
 Delete a line
-=============
-
-Delete line 2
+~~~~~~~~~~~~~~
 
+| Delete line 2
 | ``iptables -D INPUT 2``
 
+Flush out iptables
+~~~~~~~~~~~~~~~~~~~
+
+| ``iptables -P INPUT ACCEPT``
+| ``iptables -P FORWARD ACCEPT``
+| ``iptables -P OUTPUT ACCEPT``
+| ``iptables -F``
+
+
 Block IP address
-================
+~~~~~~~~~~~~~~~~~
 
 | ``iptables -I INPUT -s 62.210.245.132 -j DROP``
 
 Save Changes
-============
+~~~~~~~~~~~~~
 
 Debian & Ubuntu