Merge branch 'master' into patch-1

roles/network/templates/gateway/iiab-gen-iptables

@@ -66,6 +66,10 @@ sugarizer_port={{ sugarizer_port }}
 nodered_port={{ nodered_port }}
 mosquitto_port={{ mosquitto_port }}
 minetest_port={{ minetest_port }}
+pbx_signaling_ports_chan_sip={{ pbx_signaling_ports_chan_sip }}
+pbx_signaling_ports_chan_pjsip={{ pbx_signaling_ports_chan_pjsip }}
+pbx_data_ports={{ pbx_data_ports }}
+pbx_enabled={{ pbx_enabled }}
 block_DNS={{ block_DNS }}
 
 echo "LAN is $lan and WAN is $wan"
@@ -106,6 +110,12 @@ if [ "$services_externally_visible" == "True" ]; then
     $IPTABLES -A INPUT -p tcp --dport $transmission_http_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p tcp --dport $transmission_peer_port -m state --state NEW -i $wan -j ACCEPT
     $IPTABLES -A INPUT -p udp --dport $minetest_port -m state --state NEW -i $wan -j ACCEPT
+
+    if [ "$pbx_enabled" == "True" ]; then
+        $IPTABLES -A INPUT -p udp --dport $pbx_signaling_ports_chan_sip -m state --state NEW -i $wan -j ACCEPT
+        $IPTABLES -A INPUT -p udp --dport $pbx_signaling_ports_chan_pjsip -m state --state NEW -i $wan -j ACCEPT
+        $IPTABLES -A INPUT -p udp --dport $pbx_data_ports -m state --state NEW -i $wan -j ACCEPT
+    fi
 fi
 
 if [ "$iiab_gateway_enabled" == "True" ]; then

roles/pbx/defaults/main.yml

@@ -1,6 +1,9 @@
 # pbx_install: False
 # pbx_enabled: False
 # asterisk_chan_dongle: False
+# pbx_signaling_ports_chan_sip: "5160:5161"
+# pbx_signaling_ports_chan_pjsip: "5060"
+# pbx_data_ports: "10000:20000"
 
 # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
 # If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!

roles/pbx/tasks/asterisk.yml

@@ -145,7 +145,3 @@
     path: /etc/asterisk/asterisk.conf
     regexp: 'rungroup ='
     line: 'rungroup = asterisk'
-
-- name: Asterisk - Install chan_dongle
-  include: chan_dongle.yml
-  when: asterisk_chan_dongle

roles/pbx/tasks/freepbx.yml

@@ -108,7 +108,7 @@
     group: root
     mode: 0644
 
-- name: FreePBX - Copy freepbx.conf
+- name: FreePBX - Install Apache's sites-available/freepbx.conf from template
   template:
     src: freepbx.conf.j2
     dest: /etc/apache2/sites-available/freepbx.conf
@@ -116,37 +116,26 @@
     group: www-data
     mode: 0644
 
-- name: FreePBX - Link freepbx.conf apache file to sites-enabled
+- name: FreePBX - Create symlink freepbx.conf from sites-enabled to sites-available (if pbx_enabled)
   file: 
     src: /etc/apache2/sites-available/freepbx.conf
     dest: /etc/apache2/sites-enabled/freepbx.conf
     state: link
   when: pbx_enabled
 
-- name: FreePBX - Unlink freepbx.conf apachefile from sites-enabled
+- name: FreePBX - Remove symlink /etc/apache2/sites-enabled/freepbx.conf (if not pbx_enabled)
   file: 
     path: /etc/apache2/sites-enabled/freepbx.conf
     state: absent
-  when: (not pbx_enabled)
+  when: not pbx_enabled
 
-- name: FreePBX - Copy systemd unit file
+- name: FreePBX - Restart Apache service ({{ apache_service }})
+  systemd:
+    name: "{{ apache_service }}"    # httpd or apache2
+    state: restarted
+
+- name: FreePBX - Install /etc/systemd/system/freepbx.service systemd unit file from template
   template:
     src: freepbx.service.j2
     dest: /etc/systemd/system/freepbx.service
     mode: 755
-
-- name: FreePBX - Enable and Start freepbx service
-  systemd:
-    daemon_reload: yes
-    name: freepbx
-    enabled: yes
-    state: started
-  when: pbx_enabled
-
-- name: FreePBX - Disable & Stop freepbx service
-  systemd:
-    daemon_reload: yes
-    name: freepbx
-    enabled: no
-    state: stopped
-  when: (not pbx_enabled)

roles/pbx/tasks/freepbx_enable.yml

@@ -0,0 +1,15 @@
+- name: FreePBX - Enable & (Re)start 'freepbx' systemd service (if pbx_enabled)
+  systemd:
+    daemon_reload: yes
+    name: freepbx
+    enabled: yes
+    state: restarted
+  when: pbx_enabled
+
+- name: FreePBX - Disable & Stop 'freepbx' systemd service (if not pbx_enabled)
+  systemd:
+    daemon_reload: yes
+    name: freepbx
+    enabled: no
+    state: stopped
+  when: not pbx_enabled

roles/pbx/tasks/main.yml

@@ -16,12 +16,32 @@
       Asterisk  and FreePBX work on other OS's / distros, Thank
       You!  http://FAQ.IIAB.IO        ###############################################################################
 
+- name: Check if freepbx is already installed
+  stat: 
+    path: /etc/systemd/system/freepbx.service
+  register: freepbx_installed
+
+- debug:
+    msg: >-
+      FreePBX already installed. Reinstall shall be skipped
+  when: freepbx_installed.stat.exists
+
 - name: Install Asterisk (debuntu)
   include_tasks: asterisk.yml
-  when: internet_available and pbx_install and (not pbx_installed) and is_debuntu
+  when: internet_available and pbx_install and (not pbx_installed) and is_debuntu and (not freepbx_installed.stat.exists)
+
   #when: internet_available and pbx_install and (not pbx_installed) and ((is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18)
 
 - name: Install FreePBX (debuntu)
   include_tasks: freepbx.yml
+  when: internet_available and pbx_install and (not pbx_installed) and is_debuntu and (not freepbx_installed.stat.exists)
+  #when: internet_available and pbx_install and (not pbx_installed) and ((is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18)
+
+- name: Enable FreePBX (debuntu)
+  include_tasks: freepbx_enable.yml
   when: internet_available and pbx_install and (not pbx_installed) and is_debuntu
   #when: internet_available and pbx_install and (not pbx_installed) and ((is_debian and ansible_distribution_major_version == "9") or is_ubuntu_18)
+
+- name: Asterisk - Install chan_dongle
+  include: chan_dongle.yml
+  when: asterisk_chan_dongle

vars/default_vars.yml

@@ -301,6 +301,9 @@ nextcloud_enabled: False
 pbx_install: False
 pbx_enabled: False
 asterisk_chan_dongle: False
+pbx_signaling_ports_chan_sip: "5160:5161"
+pbx_signaling_ports_chan_pjsip: "5060"
+pbx_data_ports: "10000:20000"
 
 # If using WordPress intensively, set apache_high_php_limits in 3-BASE-SERVER
 wordpress_install: False

vars/local_vars_big.yml

@@ -197,8 +197,8 @@ nextcloud_enabled: True
 
 # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX.
 # So far, supported on Ubuntu 18.x and Debian 9 ONLY.  Uses Node.js 10.x
-pbx_install: False
+pbx_install: True
-pbx_enabled: False
+pbx_enabled: True
 asterisk_chan_dongle: False
 
 # If using WordPress intensively, set apache_high_php_limits in 3-BASE-SERVER