diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml index 9f2c3b40f..954b72366 100644 --- a/roles/9-local-addons/tasks/main.yml +++ b/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 ==================== diff --git a/roles/httpd/tasks/enable.yml b/roles/httpd/tasks/enable.yml index 787fca097..5bb9733a3 100644 --- a/roles/httpd/tasks/enable.yml +++ b/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,12 +36,12 @@ 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 diff --git a/roles/nginx/tasks/uses_apache.yml b/roles/nginx/tasks/uses_apache.yml index 4818626f8..8c679b5e2 100644 --- a/roles/nginx/tasks/uses_apache.yml +++ b/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