General cleanup, verbiage

roles/calibre/tasks/enable.yml

@@ -6,18 +6,13 @@
 # https://github.com/iiab/iiab/tree/master/roles/calibre-web/templates/calibre-web.conf.j2
 #    (anyway this works great for calibre-web, allowing http://box/books
 #    to work even better than http://box:8083 when box == 192.168.0.x !)
-- name: Create symlink calibre.conf from sites-enabled to sites-available, for UNTESTED http://box/calibre etc (debuntu)
-  file:
-    src: /etc/apache2/sites-available/calibre.conf
-    dest: /etc/apache2/sites-enabled/calibre.conf
-    state: link
-  when: calibre_enabled and is_debuntu
+- name: Attempt to enable http://box/calibre via Apache (UNTESTED)
+  command: a2ensite calibre.conf
+  when: apache_installed and calibre_enabled
 
-- name: Remove symlink /etc/apache2/sites-enabled/calibre.conf (debuntu)
-  file:
-    dest: /etc/apache2/sites-enabled/calibre.conf
-    state: absent
-  when: (not calibre_enabled) and is_debuntu
+- name: Attempt to disable http://box/calibre via Apache (UNTESTED)
+  command: a2dissite calibre.conf
+  when: apache_installed and not calibre_enabled
 
 - name: Enable & Start service 'calibre-serve' (/usr/bin/calibre-server by Kovid Goyal)
   service:

roles/nextcloud/tasks/setup.yml

@@ -40,7 +40,7 @@
 #     line: "  'datadirectory' => '{{ nextcloud_data_dir }}',"
 
 # 2020-02-16: SHOULD THIS STANZA GO AWAY IN FUTURE, in favor of 'nextcloud_installed is undefined' test below?
-- name: Use php to determine if Nextcloud is installed (causes install wizard to fail)
+- name: Use php to determine if Nextcloud is installed (which would cause the install wizard to FAIL in the next step)
   shell: >
     php {{ nextcloud_root_dir }}/occ status |
     gawk '/installed:/ { print $3 }'

roles/pbx/tasks/freepbx.yml

@@ -109,30 +109,25 @@
   template:
     src: odbc.ini.j2
     dest: /etc/odbc.ini
-    owner: root
-    group: root
-    mode: 0644
+    # owner: root
+    # group: root
+    # mode: '0644'
 
 - name: FreePBX - Install Apache's sites-available/freepbx.conf from template
   template:
     src: freepbx.conf.j2
     dest: /etc/apache2/sites-available/freepbx.conf
-    owner: www-data
-    group: www-data
-    mode: 0644
+    owner: {{ apache_user }}
+    group: {{ apache_user }}
+    mode: '0644'
 
-- 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 | bool
+- name: FreePBX - Enable http://box:{{ pbx_http_port }} via Apache, if pbx_enabled    # http://box:83
+  command: a2ensite freepbx.conf
+  when: apache_installed and pbx_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
+- name: FreePBX - Disable http://box:{{ pbx_http_port }} via Apache, if not pbx_enabled    # http://box:83
+  command: a2dissite freepbx.conf
+  when: apache_installed and not pbx_enabled
 
 - name: FreePBX - Add {{ pbx_http_port }} as a Listen directive to apache ports.conf
   lineinfile:
@@ -149,4 +144,4 @@
   template:
     src: freepbx.service.j2
     dest: /etc/systemd/system/freepbx.service
-    mode: 755
+    # mode: '0755'    # Let's go with '0644' per unit file norms

roles/sugarizer/tasks/install.yml

@@ -37,7 +37,7 @@
     depth: 1
   when: internet_available | bool
 
-- name: Create symlink /opt/iiab/sugarizer -> /opt/iiab/{{ sugarizer_dir_version }}
+- name: Symlink /opt/iiab/sugarizer -> /opt/iiab/{{ sugarizer_dir_version }}
   file:
     src: "{{ iiab_base }}/{{ sugarizer_dir_version }}"
     dest: "{{ iiab_base }}/sugarizer"
@@ -70,7 +70,7 @@
     depth: 1
   when: internet_available | bool
 
-- name: Create symlink /opt/iiab/sugarizer-server -> /opt/iiab/{{ sugarizer_server_dir_version }}
+- name: Symlink /opt/iiab/sugarizer-server -> /opt/iiab/{{ sugarizer_server_dir_version }}
   file:
     src: "{{ iiab_base }}/{{ sugarizer_server_dir_version }}"
     dest: "{{ iiab_base }}/sugarizer-server"