Merge branch 'pbx-fixes' of https://github.com/m-anish/iiab into pbx-fixes

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,42 @@
     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
+- name: FreePBX - Enable & (Re)start 'freepbx' systemd service (if pbx_enabled)
   systemd:
     daemon_reload: yes
     name: freepbx
     enabled: yes
-    state: started
+    state: restarted
   when: pbx_enabled
 
-- name: FreePBX - Disable & Stop freepbx service
+- 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)
+  when: not pbx_enabled