Merge remote-tracking branch 'refs/remotes/origin/patch-12'

source/Iptables.rst

@@ -0,0 +1,67 @@
+.. image:: _static/images/logo.png
+   :width: 40px
+   :alt: Fusionpbx
+   :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 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 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``
+| ``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
+
+``iptables -D INPUT 2``
+
+Block IP address
+================
+
+iptables -I INPUT -s 62.210.245.132 -j DROP
+
+Save Changes
+============
+
+Debian / Ubuntu
+
+| `` apt-get install iptables-persistent``
+| `` service iptables-persistent save``

source/conf.py

@@ -49,16 +49,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'FusionPBX Docs'
-copyright = u'2014, Mark J Crane'
+copyright = u'2008-2015, Mark J Crane'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '3.6.2'
+version = '4.0.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.6.2'
+release = '4.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

source/getting-started.rst

@@ -9,7 +9,7 @@ Just follow the menu to the left and you will have a working PBX in no time.
 
   There are many ways to install FusionPBX depending on how you want to architect your solution.
   What is presented here represents the quickest, easiest, best supported way to a FusionPBX system.
-  For advanced topics please attend a class or join us on IRC
+  For advanced topics consider attending the training. Details for the training can be found at http://fusionpbx.com.
 
 
 .. toctree::

source/getting-started/new-install.rst

@@ -0,0 +1,101 @@
+*****************
+New Install
+*****************
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+*************
+
+
+
+    Welcome to the FUSIONPBX getting started guide.  In this section we will show how to install FUSIONPBX.  FUSIONPBX can be used on multiple different operating systems, databases, and web servers.  In this guide we will show on Debian 8 (Jessie), Postgresql and NGINX.  **Please note to have a clean install.  The install script will install everthing but the Operating System**
+    
+    
+    **1.** Goto a console and follow the recomended steps from http://fusionpbx.com/download.php  
+     
+    ::
+     
+     cd /usr/src 
+     apt-get install wget  
+     wget https://raw.githubusercontent.com/fusionpbx/fusionpbx-scripts/master/install/ubuntu/install_fusionpbx.sh  
+     chmod 755 install_fusionpbx.sh 
+     ./install_fusionpbx.sh install-both auto 
+     
+    **2.** The install script will apt-get update/upgrade the system and ask you a few questions
+     
+     
+    ::
+     
+     The pgsql username is fusionpbx
+     The pgsql database name is freeswitch
+     Please provide a password for the fusionpbx user
+      Password:IloveFusionpbx
+     Let's repeat that
+      Password:IloveFusionpbx
+     
+    *It can take between 15-30 minutes to compile and install*
+     
+    **3.** Goto a web browser and enter the ip address
+    ::
+     
+     Now you'll need to manually finish the install and come back
+     This way I can finish up the last bit of permissions issues
+     Just go to
+     http://ur_domain_or_ip.com
+     MAKE SURE YOU CHOOSE PostgreSQL as your Database on the first page!!!
+     ON the Second Page:
+     Database Name: fusionpbx
+     Database Username: fusionpbx
+     Database Password: whateveryouentered
+     Create Database Username: Leave_Blank
+     Create Database Password: Leave_Blank
+ 
+
+     
+    **4.** Web browser Installation part
+     :Select Language: **Pick your language. Click next**
+     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797615/3b84a6aa-a292-11e5-92be-9130fe480f9b.jpg
+     
+     :Freeswitch Detect: **Detecting folder paths used** 
+     .. image:: https://cloud.githubusercontent.com/assets/13131198/11802026/c5a78c04-a2b9-11e5-9a79-e77ef3298c49.jpg 
+     
+     **Don't change anything here**
+     
+     :Database Configuration: **Click Execute**
+     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797607/2bfe2fb2-a292-11e5-9d58-e344678f3fdb.jpg 
+     
+     **Don't change anything here** 
+     
+     :Admin Login Configuration: **Click Next**
+     .. image:: https://cloud.githubusercontent.com/assets/13131198/11797659/99b6c424-a292-11e5-81a2-1bfae36ce197.jpg 
+     
+     This will create the superadmin login that will be used in your web browser.
+     
+    **5.** Goto Console and press enter 
+    ::
+     When PostgreSQL is configured come back and press enter.
+     
+     The FusionPBX installation changed permissions of /usr/local/freeswitch/storage
+     Waiting on you to finish installation (via browser), I'll clean up
+     the last bit of permissions when you finish.Waiting on /var/www/fusionpbx/resources/config.php
+     
+     /var/www/fusionpbx/resources/config.php Found!
+     Waiting 5 more seconds to be sure.
+     .....   Fixing...
+     FIXED
+     Setting up Fail2Ban for FusionPBX
+     
+     
+     
+     Installation Completed.  Now configure FreeSWITCH via the FusionPBX browser interface
+     
+     http://104.233.77.151
+     Default login is (whatever you picked in the GUI install):
+     User: WhateverUsernameYouPicked
+     Passwd: YourPasswordYouPicked
+     Checking to see if FreeSWITCH is running!
+        
+     
+    
+    :Install Finished:  **Login!!!**
+    .. image:: https://cloud.githubusercontent.com/assets/13131198/11797604/25935530-a292-11e5-8612-7dba48d65bde.jpg 
+    
+    .. image:: https://cloud.githubusercontent.com/assets/13131198/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png

source/getting-started/post-installation.rst

@@ -2,4 +2,4 @@
 Post Installation
 *****************
 
-Lorem Ipsum
+.. include:: Iptables.rst

source/installation.rst

@@ -2,12 +2,12 @@
 Installation
 ************
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+Welcome to the Installation section.  Here you will find Getting started Guides on how to install FusionPBX different operating systems.  The default method is on Debian 8 (Jessie) with the recomended isntall script 
 
 .. toctree::
   :maxdepth: 3
   :glob:
 
-  installation/debian-scripted
+  getting-started/new-install.rst
   installation/debian-pkgs
-  installation/debian-iso-install
+  installation/debian-iso-install

source/manual/multi-tenancy.rst

@@ -1,5 +0,0 @@
-*************
-Multi Tenancy
-*************
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 

source/manual/multi-tenant.rst

@@ -0,0 +1,5 @@
+*************
+Multi Tenant
+*************
+
+Content placeholder