Merge pull request #20 from Len-PGH/master

Updates

source/Gateway-Inbound-Outbound.rst

@@ -0,0 +1,10 @@
+*************
+Gateway Inbound Outbound
+*************
+
+
+.. toctree::
+  :maxdepth: 2
+  :glob:
+  
+  Gateway-Inbound-Outbound/Gateway.rst

source/Gateway-Inbound-Outbound/Gateway.rst

@@ -0,0 +1,50 @@
+Gateway setup
+===========
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+.
+.
+.
+..
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+
+Inbound Destination setup
+===========
+
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+.
+
+Outbound setup
+===========
+
+
+.
+.
+.
+.

source/getting-started.rst

@@ -2,8 +2,8 @@
 Getting Started
 ***************
 
-So.. You want to install FusionPBX, well your in good hands.
-Just follow the menu to the left and you will have a working PBX in no time.
+Welcome! Let's install FusionPBX.
+Follow the menu to the left and you will have a working PBX in no time.
 
 .. note::
 
@@ -13,9 +13,10 @@ Just follow the menu to the left and you will have a working PBX in no time.
 
 
 .. toctree::
-  :maxdepth: 3
+  :maxdepth: 4
   :glob:
 
   getting-started/pre-installation.rst
   getting-started/installation-recommended.rst
   getting-started/post-installation.rst
+  iptables.rst

source/getting-started/installation-recommended.rst

@@ -1,5 +1,103 @@
-**************************
-Installation (Recommended)
-**************************
+*****************
+New Install
+*****************
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
+*************
 
-lorem ipsum
+
+
+    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/11783217/fbb7a2e6-a243-11e5-9c06-e3a55882ea51.png
+    .. 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/iptables.rst

@@ -0,0 +1,65 @@
+iptables
+===========
+
+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/getting-started/new-install.rst

@@ -1,96 +0,0 @@
-.. image:: https://github.com/fusionpbx/fusionpbx/blob/master/themes/enhanced/images/logo.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

@@ -1,5 +1,9 @@
 *****************
 Post Installation
 *****************
+.. image:: https://cloud.githubusercontent.com/assets/13131198/11903431/270a6c1c-a587-11e5-8473-f7e84e02bf0c.png
 
-.. include:: Iptables.rst
+
+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.
+
+.. include:: iptables.rst

source/getting-started/pre-installation.rst

@@ -2,4 +2,12 @@
 Pre Installation
 *****************
 
-Lorem Ipsum
+  Start with a fresh install of the Operating system of your choice.  Install **only** the operating system at this point as a clean slate is needed for an optimal install.  Please note the recomended OS is Debian Jessie.
+  
+   **Debian 7+** No other dependencies needed
+   
+   **Ubuntu 14.04+** dependencies needed
+   
+   **Centos 7+** dependencies needed
+   
+   **Windows** dependencies needed

source/index.rst

@@ -61,6 +61,7 @@ Getting Started
 
     getting-started.rst
     installation.rst
+    Gateway-Inbound-Outbound.rst
     contributing.rst
     manual.rst
     doc-guide.rst

source/installation.rst

@@ -2,7 +2,7 @@
 Installation
 ************
 
-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 
+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 install script 
 
 .. toctree::
   :maxdepth: 3

source/installation/debian-scripted.rst

@@ -13,17 +13,18 @@ Requirements
 Software
 ~~~~~~~~
 
-* **Database** : PostgreSQL 9.x / MySQL / SQLite *(PostgreSQL recommended)*
+* **Database** : PostgreSQL 9.x / SQLite *(PostgreSQL recommended)*
 * **Web Server** : nginx / apache *(nginx recommended)*
 * **PHP** : 5.x *(Version 5.5 recommended)*
-* **FreeSWITCH** : 1.4.x * *(Version 1.4.12 recommended)*
+* **FreeSWITCH** : 1.4.x * *(Version 1.4.26 recommended)*
 
 Hardware
 ~~~~~~~~
 
-* **RAM** : x.x *(X recommended)*
-* **DISK** : x.x *(X recommended)*
-* **CPU** : x.x *(X recommended)*
+
+* **RAM** : 512MB *(1GB+ recommended)*
+* **DISK** : 10GB *(20GB+ recommended)*
+* **CPU** : Single core 2266 MHz *(Dual core 2266 MHz+ recommended)*
 
 
 
@@ -33,7 +34,7 @@ Installation Guide
 # 1 - Debian ISO Download
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-`Download <http://www.debian.org/distrib/netinst>`_ Debian Lenny net install ISO 
+`Download <http://www.debian.org/distrib/netinst>`_ Debian Jessie net install ISO 
 
 # 2 - nginx Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~

source/manual.rst

@@ -2,7 +2,7 @@
 User Manual
 ***********
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+ 
 
 .. toctree::
   :maxdepth: 2

source/manual/accounts.rst

@@ -2,27 +2,32 @@
 Accounts
 ********
 
+**Accounts** - clicking directly on Accounts without selecting a
+sub-menu will take you to the `Extensions <Extensions>`__ page
+
 Extensions
 ----------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Extensions <Extensions>`__ - where you configure the extensions for the phones attached to your system
+  
+
 
 Gateways
 --------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Gateways <Gateways>`__ - to define the outbound gateways that are used to make calls to destinations outside of your FusionPBX/FreeSWITCH server
 
 Phones
 ------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Phones <Phones>`__ - for seeing and modifying all provisioned phones. See `Extensions <Extensions>`__ for more information 
 
 User Manager
 ------------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `User Manager <User_Manager>`__ - Allows a superadmin/admin to manage USERs and GROUPs. Can create/delete users, edit their `Account Settings <Account_Settings>`__
 
-XMPP Manager
+XMPP Manager 
 ------------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `XMPP Manager <XMPP_Manager>`__ - Configure XMPP to work with Google talk or other jabber servers (Non-Standard Add-On)

source/manual/system.rst

@@ -5,24 +5,24 @@ System
 Account Settings
 ----------------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Account Settings <Account_Settings>`__ - the account settings for the currently logged on user 
 
 Logout
 ------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Logout <Logout>`__ - use this to log out of the FusionPBX administration web site 
 
 Modules
 -------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Modules <Modules>`__ - for enabling and disabling FreeSWITCH modules 
 
 Settings
 --------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Settings <Settings>`__ - basic FusionPBX settings 
 
 Variables
 ---------
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. His singulis copiose responderi solet, sed quae perspicua sunt longa esse 
+-  `Variables <Variables>`__ - Manage FreeSWITCH `preprocessor variables <http://wiki.freeswitch.org/wiki/Config_vars.xml>`__