Cleaner roles/web_support & httpd/tasks/install.yml

roles/httpd/tasks/install.yml

@@ -162,14 +162,14 @@
 
 # MOVED FROM roles/homepage/tasks/main.yml (as NGINX-only IIAB's won't need it)
 # and 'mkdir /library/www/html/home' is now done by roles/web_support for Admin
-# Console which hard-codes that as a requirement as of 2020-02-12.
+# Console which hard-codes that as a requirement, as of 2020-02-12.
 #
 # './runrole --reinstall apache' is a decent solution today, for folks needing
 # changes, but to make sure such things work in the field/offline/etc: soft-
 # coding of iiab_home_url should probably be taken more seriously thruout IIAB!
 #
 - name: "IN CASE NGINX IS DISABLED: Enable iiab-homepage.conf via Apache (e.g. on port 80) by running 'a2ensite iiab-homepage.conf'"
-  command: a2ensite: iiab-homepage.conf
+  command: a2ensite iiab-homepage.conf
   #when: apache_enabled | bool
 
 # - name: Disable IIAB pages via Apache (e.g. on port 80) by running 'a2dissite iiab-homepage.conf', if not apache_enabled"

roles/web_support/tasks/html.yml

@@ -1,68 +1,68 @@
-- name: Copy css files to {{ doc_root }}/common/css    # doc_root is /library/www/html
+- name: Copy css files to {{ doc_root }}/common/css
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/common/css"
+    dest: "{{ doc_root }}/common/css"    # /library/www/html
-    mode: 0644
+    # owner: root
-    owner: root
+    # group: root
-    group: root
+    # mode: '0644'
   with_fileglob:
     - html/css/*.css
 
-- name: Copy js files to {{ doc_root }}/common/js    # doc_root is /library/www/html
+- name: Copy js files to {{ doc_root }}/common/js
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/common/js"
+    dest: "{{ doc_root }}/common/js"    # /library/www/html
-    mode: 0644
+    # owner: root
-    owner: root
+    # group: root
-    group: root
+    # mode: '0644'
   with_fileglob:
     - html/js/*.js
 
-- name: Copy fonts files to {{ doc_root }}/common/fonts    # doc_root is /library/www/html
+- name: Copy fonts files to {{ doc_root }}/common/fonts
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/common/fonts"
+    dest: "{{ doc_root }}/common/fonts"    # /library/www/html
-    mode: 0644
+    # owner: root
-    owner: root
+    # group: root
-    group: root
+    # mode: '0644'
   with_fileglob:
     - html/fonts/*
 
-- name: Copy html files to {{ doc_root }}/common/html    # doc_root is /library/www/html
+- name: Copy html files to {{ doc_root }}/common/html
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/common/html"
+    dest: "{{ doc_root }}/common/html"    # /library/www/html
-    mode: 0644
+    # owner: root
-    owner: root
+    # group: root
-    group: root
+    # mode: '0644'
   with_fileglob:
     - html/html/*
 
-- name: Copy assets files to {{ doc_root }}/common/assets    # doc_root is /library/www/html
+- name: Copy assets files to {{ doc_root }}/common/assets
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/common/assets"
+    dest: "{{ doc_root }}/common/assets"    # /library/www/html
-    mode: 0644
+    # owner: root
-    owner: root
+    # group: root
-    group: root
+    # mode: '0644'
   with_fileglob:
     - html/assets/*
 
-# copy all services, even if not permissioned elsewhere
+# Copy all services, even if not permissioned elsewhere
-- name: Copy services files to {{ doc_root }}/common/services    # doc_root is /library/www/html
+- name: Copy services files to {{ doc_root }}/common/services
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/common/services"
+    dest: "{{ doc_root }}/common/services"    # /library/www/html
-    mode: 0644
+    # owner: root
-    owner: root
+    # group: root
-    group: root
+    # mode: '0644'
   with_fileglob:
     - html/services/*
 
-- name: Symlink {{ doc_root }}/common/assets/iiab.ini to {{ iiab_ini_file }}    # doc_root is /library/www/html
+- name: Symlink {{ doc_root }}/common/assets/iiab.ini -> {{ iiab_ini_file }}
   file:
-    src: "{{ iiab_ini_file }}"
+    src: "{{ iiab_ini_file }}"    # /etc/iiab/iiab.ini
-    path: "{{ doc_root }}/common/assets/iiab.ini"
+    path: "{{ doc_root }}/common/assets/iiab.ini"    # /library/www/html
-    owner: root
+    # owner: root
-    group: root
+    # group: root
     state: link