Merge pull request #2135 from holta/nginx-httpd-fix-clean

NGINX & Apache: bug fix & Stage 9 a bit cleaner

roles/3-base-server/tasks/main.yml

@@ -6,7 +6,7 @@
 - name: HTTPD (APACHE)
   include_role:
     name: httpd
-  when: apache_install
+  when: apache_install | bool
   tags: base, httpd
 
 - name: MYSQL
@@ -17,11 +17,11 @@
 
 - name: Install nginx
   include_tasks: roles/nginx/tasks/install.yml
-  when: nginx_install
+  when: nginx_install | bool
 
 - name: Install dnsmasq
   include_tasks: roles/network/tasks/dnsmasq.yml
-  when: dnsmasq_install
+  when: dnsmasq_install | bool
   tags: base, domain, dnsmasq, network
 
 - name: Recording STAGE 3 HAS COMPLETED =====================

roles/9-local-addons/tasks/main.yml

@@ -38,17 +38,18 @@
     name: calibre-web
   tags: calibre-web
 
-# could split this two below to stage 10?
+# Could split these two below to Stage 10?
+
 - name: Configure NGINX
   include_role:
     name: nginx
-  when: nginx_install
+  when: nginx_install | bool
   tags: base, nginx
 
 - name: Configure Apache systemd service ({{ apache_service }})
   include_role:
     name: httpd-enable
-  when: apache_install
+  when: apache_install | bool
   tags: base, httpd
 
 - name: Recording STAGE 9 HAS COMPLETED ====================

roles/httpd/tasks/enable.yml

@@ -17,9 +17,9 @@
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
-    owner: root
-    group: root
-    mode: 0644
+    # owner: root
+    # group: root
+    # mode: 0644
   with_items:
     - { src: 'roles/httpd/templates/010-iiab.conf.j2', dest: '/etc/{{ apache_config_dir }}/010-iiab.conf' }
     - { src: 'roles/httpd/templates/proxy_ajp.conf.j2', dest: '/etc/{{ apache_config_dir }}/proxy_ajp.conf' }
@@ -36,17 +36,17 @@
   copy:
     src: roles/httpd/files/osm.conf
     dest: "/etc/{{ apache_config_dir }}"
-    owner: root
-    group: root
-    mode: 0644
+    # owner: root
+    # group: root
+    # mode: 0644
   when: osm_vector_maps_install | bool
 
-- name: Symlink /etc/apache2/sites-enabled/osm.conf to /etc/{{ apache_config_dir }}/osm.conf (debuntu)
+- name: Symlink /etc/apache2/sites-enabled/osm.conf -> /etc/{{ apache_config_dir }}/osm.conf (debuntu)
   file:
     src: "/etc/{{ apache_config_dir }}/osm.conf"
     path: /etc/apache2/sites-enabled/osm.conf
     state: link
-  when: is_debuntu | bool and osm_vector_maps_enabled | bool
+  when: is_debuntu and osm_vector_maps_enabled
 
 - name: Give {{ apache_user }} (per variable apache_user) permission to poweroff, installing /etc/sudoers.d/020_apache_poweroff from template
   template:

roles/nginx/tasks/uses_apache.yml

@@ -5,37 +5,37 @@
 - name: Install {{ nginx_config_dir }}/dokuwiki-nginx.conf from template, if dokuwiki_enabled
   template:
     src: dokuwiki-nginx.conf
-    dest: {{ nginx_config_dir }}/dokuwiki-nginx.conf    # /etc/nginx/conf.d
+    dest: "{{ nginx_config_dir }}/dokuwiki-nginx.conf"    # /etc/nginx/conf.d
   when: dokuwiki_enabled | bool
 
 - name: Install {{ nginx_config_dir }}/elgg-nginx.conf from template, if elgg_enabled
   template:
     src: elgg-nginx.conf
-    dest: {{ nginx_config_dir }}/elgg-nginx.conf    # /etc/nginx/conf.d
+    dest: "{{ nginx_config_dir }}/elgg-nginx.conf"    # /etc/nginx/conf.d
   when: elgg_enabled | bool
 
 - name: Install {{ nginx_config_dir }}/lokole-nginx.conf from template, if lokole_enabled
   template:
     src: lokole-nginx.conf.j2
-    dest: {{ nginx_config_dir }}/lokole-nginx.conf    # /etc/nginx/conf.d
+    dest: "{{ nginx_config_dir }}/lokole-nginx.conf"    # /etc/nginx/conf.d
   when: lokole_enabled | bool
 
 - name: Install {{ nginx_config_dir }}/moodle-nginx.conf from template, if moodle_enabled
   template:
     src: moodle-nginx.conf.j2
-    dest: {{ nginx_config_dir }}/moodle-nginx.conf    # /etc/nginx/conf.d
+    dest: "{{ nginx_config_dir }}/moodle-nginx.conf"    # /etc/nginx/conf.d
   when: moodle_enabled | bool
 
 - name: Install {{ nginx_config_dir }}/nextcloud-nginx.conf from template, if nextcloud_enabled
   template:
     src: nextcloud-nginx.conf
-    dest: {{ nginx_config_dir }}/nextcloud-nginx.conf    # /etc/nginx/conf.d
+    dest: "{{ nginx_config_dir }}/nextcloud-nginx.conf"    # /etc/nginx/conf.d
   when: nextcloud_enabled | bool
 
 - name: Install {{ nginx_config_dir }}/nodered-nginx.conf from template, if nodered_enabled
   template:
     src: nodered-nginx.conf.j2
-    dest: {{ nginx_config_dir }}/nodered-nginx.conf    # /etc/nginx/conf.d
+    dest: "{{ nginx_config_dir }}/nodered-nginx.conf"    # /etc/nginx/conf.d
     # mode: '0666'
   when: nodered_enabled | bool