diff --git a/roles/nginx/tasks/uses_apache.yml b/roles/nginx/tasks/uses_apache.yml index 41725fc90..4818626f8 100644 --- a/roles/nginx/tasks/uses_apache.yml +++ b/roles/nginx/tasks/uses_apache.yml @@ -1,37 +1,41 @@ -- name: Install /etc/nginx/conf.d/dokuwiki-nginx.conf from template, if dokuwiki_enabled +# The ~40 lines of code below are near-identical to what's in tasks/enable.yml +# for these 6 playbooks. Any way PR #2131 etc can help reduce duplication? + + +- name: Install {{ nginx_config_dir }}/dokuwiki-nginx.conf from template, if dokuwiki_enabled template: src: dokuwiki-nginx.conf - dest: /etc/nginx/conf.d/dokuwiki-nginx.conf + dest: {{ nginx_config_dir }}/dokuwiki-nginx.conf # /etc/nginx/conf.d when: dokuwiki_enabled | bool -- name: Install /etc/nginx/conf.d/elgg-nginx.conf from template, if elgg_enabled +- name: Install {{ nginx_config_dir }}/elgg-nginx.conf from template, if elgg_enabled template: src: elgg-nginx.conf - dest: /etc/nginx/conf.d/elgg-nginx.conf + dest: {{ nginx_config_dir }}/elgg-nginx.conf # /etc/nginx/conf.d when: elgg_enabled | bool -- name: Install /etc/nginx/conf.d/lokole-nginx.conf from template, if lokole_enabled +- name: Install {{ nginx_config_dir }}/lokole-nginx.conf from template, if lokole_enabled template: src: lokole-nginx.conf.j2 - dest: /etc/nginx/conf.d/lokole-nginx.conf + dest: {{ nginx_config_dir }}/lokole-nginx.conf # /etc/nginx/conf.d when: lokole_enabled | bool -- name: Install /etc/nginx/conf.d/moodle-nginx.conf from template, if moodle_enabled +- name: Install {{ nginx_config_dir }}/moodle-nginx.conf from template, if moodle_enabled template: src: moodle-nginx.conf.j2 - dest: /etc/nginx/conf.d/moodle-nginx.conf + dest: {{ nginx_config_dir }}/moodle-nginx.conf # /etc/nginx/conf.d when: moodle_enabled | bool -- name: Install /etc/nginx/conf.d/nextcloud-nginx.conf from template, if nextcloud_enabled +- name: Install {{ nginx_config_dir }}/nextcloud-nginx.conf from template, if nextcloud_enabled template: src: nextcloud-nginx.conf - dest: /etc/nginx/conf.d/nextcloud-nginx.conf + dest: {{ nginx_config_dir }}/nextcloud-nginx.conf # /etc/nginx/conf.d when: nextcloud_enabled | bool -- name: Install /etc/nginx/conf.d/nodered-nginx.conf from template, if nodered_enabled +- name: Install {{ nginx_config_dir }}/nodered-nginx.conf from template, if nodered_enabled template: src: nodered-nginx.conf.j2 - dest: /etc/nginx/conf.d/nodered-nginx.conf + dest: {{ nginx_config_dir }}/nodered-nginx.conf # /etc/nginx/conf.d # mode: '0666' when: nodered_enabled | bool