From b7151fe047f58312b783df32fabe07729cb52dda Mon Sep 17 00:00:00 2001 From: root Date: Fri, 24 Jan 2020 01:08:42 -0500 Subject: [PATCH] Rename var nginx_config_dir to nginx_conf_dir --- roles/awstats/tasks/enable.yml | 8 +++---- roles/calibre-web/tasks/enable.yml | 8 +++---- roles/dokuwiki/tasks/enable.yml | 8 +++---- roles/elgg/tasks/enable.yml | 8 +++---- roles/gitea/tasks/enable.yml | 8 +++---- roles/kiwix/tasks/enable.yml | 8 +++---- roles/kolibri/tasks/enable.yml | 8 +++---- roles/lokole/tasks/enable.yml | 8 +++---- roles/mediawiki/tasks/enable.yml | 8 +++---- roles/moodle/tasks/enable.yml | 8 +++---- roles/munin/tasks/nginx.yml | 8 +++---- roles/nextcloud/tasks/enable.yml | 8 +++---- roles/nginx/defaults/main.yml | 2 +- roles/nginx/tasks/main.yml | 10 ++++---- roles/nginx/tasks/uses_apache.yml.deprecated | 24 ++++++++++---------- roles/nginx/templates/server.conf.j2 | 2 +- roles/nodered/tasks/enable.yml | 8 +++---- roles/osm-vector-maps/tasks/main.yml | 8 +++---- roles/sugarizer/tasks/enable.yml | 8 +++---- roles/wordpress/tasks/nginx.yml | 8 +++---- vars/default_vars.yml | 2 +- 21 files changed, 84 insertions(+), 84 deletions(-) diff --git a/roles/awstats/tasks/enable.yml b/roles/awstats/tasks/enable.yml index 8a4529597..a0278bcf6 100644 --- a/roles/awstats/tasks/enable.yml +++ b/roles/awstats/tasks/enable.yml @@ -16,18 +16,18 @@ # NGINX -- name: Enable http://box/awstats via NGINX, by installing /etc/nginx/cgi-bin.php & {{ nginx_config_dir }}/awstats-nginx.conf from template +- name: Enable http://box/awstats via NGINX, by installing /etc/nginx/cgi-bin.php & {{ nginx_conf_dir }}/awstats-nginx.conf from template template: src: "{{ item.src }}" dest: "{{ item.dest }}" with_items: - - { src: "awstats-nginx.conf", dest: "{{ nginx_config_dir }}/" } + - { src: "awstats-nginx.conf", dest: "{{ nginx_conf_dir }}/" } - { src: "cgi-bin.php", dest: "/etc/nginx/" } when: nginx_install and awstats_enabled -- name: Disable http://box/awstats_url via NGINX, by removing {{ nginx_config_dir }}/awstats-nginx.conf +- name: Disable http://box/awstats_url via NGINX, by removing {{ nginx_conf_dir }}/awstats-nginx.conf file: - path: "{{ nginx_config_dir }}/awstats-nginx.conf" + path: "{{ nginx_conf_dir }}/awstats-nginx.conf" state: absent when: nginx_install and not awstats_enabled diff --git a/roles/calibre-web/tasks/enable.yml b/roles/calibre-web/tasks/enable.yml index 59d4db6cb..6e36672b2 100644 --- a/roles/calibre-web/tasks/enable.yml +++ b/roles/calibre-web/tasks/enable.yml @@ -37,15 +37,15 @@ # TO DO: restore http://box/libros & http://box/livres, along English (http://box/books) -- name: Enable http://box{{ calibreweb_url1 }} via NGINX, by installing {{ nginx_config_dir }}/calibre-web-nginx.conf from template +- name: Enable http://box{{ calibreweb_url1 }} via NGINX, by installing {{ nginx_conf_dir }}/calibre-web-nginx.conf from template template: src: calibre-web-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/calibre-web-nginx.conf" + dest: "{{ nginx_conf_dir }}/calibre-web-nginx.conf" when: nginx_install and calibreweb_enabled -- name: Disable http://box{{ calibreweb_url1 }} via NGINX, by removing {{ nginx_config_dir }}/calibre-web-nginx.conf +- name: Disable http://box{{ calibreweb_url1 }} via NGINX, by removing {{ nginx_conf_dir }}/calibre-web-nginx.conf file: - path: "{{ nginx_config_dir }}/calibre-web-nginx.conf" + path: "{{ nginx_conf_dir }}/calibre-web-nginx.conf" state: absent when: nginx_install and not calibreweb_enabled diff --git a/roles/dokuwiki/tasks/enable.yml b/roles/dokuwiki/tasks/enable.yml index 55df3cfae..45e08a407 100644 --- a/roles/dokuwiki/tasks/enable.yml +++ b/roles/dokuwiki/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ dokuwiki_url }} via NGINX, by installing {{ nginx_config_dir }}/dokuwiki-nginx.conf from template" # http://box/dokuwiki +- name: "SHIM: Enable http://box{{ dokuwiki_url }} via NGINX, by installing {{ nginx_conf_dir }}/dokuwiki-nginx.conf from template" # http://box/dokuwiki template: src: dokuwiki-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/dokuwiki-nginx.conf" + dest: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf" when: nginx_install and dokuwiki_enabled -- name: "SHIM: Disable http://box{{ dokuwiki_url }} via NGINX, by removing {{ nginx_config_dir }}/dokuwiki-nginx.conf" # http://box/dokuwiki +- name: "SHIM: Disable http://box{{ dokuwiki_url }} via NGINX, by removing {{ nginx_conf_dir }}/dokuwiki-nginx.conf" # http://box/dokuwiki file: - path: "{{ nginx_config_dir }}/dokuwiki-nginx.conf" + path: "{{ nginx_conf_dir }}/dokuwiki-nginx.conf" state: absent when: nginx_install and not dokuwiki_enabled diff --git a/roles/elgg/tasks/enable.yml b/roles/elgg/tasks/enable.yml index e28c84323..249ab6de0 100644 --- a/roles/elgg/tasks/enable.yml +++ b/roles/elgg/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ elgg_url }} via NGINX, by installing {{ nginx_config_dir }}/elgg-nginx.conf from template" # http://box/elgg +- name: "SHIM: Enable http://box{{ elgg_url }} via NGINX, by installing {{ nginx_conf_dir }}/elgg-nginx.conf from template" # http://box/elgg template: src: elgg-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/elgg-nginx.conf" + dest: "{{ nginx_conf_dir }}/elgg-nginx.conf" when: nginx_install and elgg_enabled -- name: "SHIM: Disable http://box{{ elgg_url }} via NGINX, by removing {{ nginx_config_dir }}/elgg-nginx.conf" # http://box/elgg +- name: "SHIM: Disable http://box{{ elgg_url }} via NGINX, by removing {{ nginx_conf_dir }}/elgg-nginx.conf" # http://box/elgg file: - path: "{{ nginx_config_dir }}/elgg-nginx.conf" + path: "{{ nginx_conf_dir }}/elgg-nginx.conf" state: absent when: nginx_install and not elgg_enabled diff --git a/roles/gitea/tasks/enable.yml b/roles/gitea/tasks/enable.yml index 5b706a14e..925f5c041 100644 --- a/roles/gitea/tasks/enable.yml +++ b/roles/gitea/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: Enable http://box{{ gitea_url }} via NGINX, by installing {{ nginx_config_dir }}/gitea-nginx.conf from template +- name: Enable http://box{{ gitea_url }} via NGINX, by installing {{ nginx_conf_dir }}/gitea-nginx.conf from template template: src: gitea-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/gitea-nginx.conf" + dest: "{{ nginx_conf_dir }}/gitea-nginx.conf" when: nginx_install and gitea_enabled -- name: Disable http://box{{ gitea_url }} via NGINX, by removing {{ nginx_config_dir }}/gitea-nginx.conf +- name: Disable http://box{{ gitea_url }} via NGINX, by removing {{ nginx_conf_dir }}/gitea-nginx.conf file: - path: "{{ nginx_config_dir }}/gitea-nginx.conf" + path: "{{ nginx_conf_dir }}/gitea-nginx.conf" state: absent when: nginx_install and not gitea_enabled diff --git a/roles/kiwix/tasks/enable.yml b/roles/kiwix/tasks/enable.yml index 0fa9519e4..f4fff7ca2 100644 --- a/roles/kiwix/tasks/enable.yml +++ b/roles/kiwix/tasks/enable.yml @@ -53,15 +53,15 @@ # NGINX -- name: Enable http://box{{ kiwix_url_without_slash }} via NGINX, by installing {{ nginx_config_dir }}/kiwix-nginx.conf from template +- name: Enable http://box{{ kiwix_url_without_slash }} via NGINX, by installing {{ nginx_conf_dir }}/kiwix-nginx.conf from template template: src: kiwix-nginx.conf - dest: "{{ nginx_config_dir }}/kiwix-nginx.conf" + dest: "{{ nginx_conf_dir }}/kiwix-nginx.conf" when: nginx_install and kiwix_enabled -- name: Disable http://box{{ kiwix_url_without_slash }} via NGINX, by removing {{ nginx_config_dir }}/kiwix-nginx.conf +- name: Disable http://box{{ kiwix_url_without_slash }} via NGINX, by removing {{ nginx_conf_dir }}/kiwix-nginx.conf file: - path: "{{ nginx_config_dir }}/kiwix-nginx.conf" + path: "{{ nginx_conf_dir }}/kiwix-nginx.conf" state: absent when: nginx_install and not kiwix_enabled diff --git a/roles/kolibri/tasks/enable.yml b/roles/kolibri/tasks/enable.yml index 0bbd088b0..7395628fe 100644 --- a/roles/kolibri/tasks/enable.yml +++ b/roles/kolibri/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: Enable http://box{{ kolibri_url }} via NGINX, by installing {{ nginx_config_dir }}/kolibri-nginx.conf from template +- name: Enable http://box{{ kolibri_url }} via NGINX, by installing {{ nginx_conf_dir }}/kolibri-nginx.conf from template template: src: kolibri-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/kolibri-nginx.conf" + dest: "{{ nginx_conf_dir }}/kolibri-nginx.conf" when: nginx_install and kolibri_enabled -- name: Disable http://box{{ kolibri_url }} via NGINX, by removing {{ nginx_config_dir }}/kolibri-nginx.conf +- name: Disable http://box{{ kolibri_url }} via NGINX, by removing {{ nginx_conf_dir }}/kolibri-nginx.conf file: - path: "{{ nginx_config_dir }}/kolibri-nginx.conf" + path: "{{ nginx_conf_dir }}/kolibri-nginx.conf" state: absent when: nginx_install and not kolibri_enabled diff --git a/roles/lokole/tasks/enable.yml b/roles/lokole/tasks/enable.yml index 981925e85..a8701376c 100644 --- a/roles/lokole/tasks/enable.yml +++ b/roles/lokole/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ lokole_url }} via NGINX, by installing {{ nginx_config_dir }}/lokole-nginx.conf from template" # http://box/lokole +- name: "SHIM: Enable http://box{{ lokole_url }} via NGINX, by installing {{ nginx_conf_dir }}/lokole-nginx.conf from template" # http://box/lokole template: src: lokole-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/lokole-nginx.conf" + dest: "{{ nginx_conf_dir }}/lokole-nginx.conf" when: nginx_install and lokole_enabled -- name: "SHIM: Disable http://box{{ lokole_url }} via NGINX, by removing {{ nginx_config_dir }}/lokole-nginx.conf" # http://box/lokole +- name: "SHIM: Disable http://box{{ lokole_url }} via NGINX, by removing {{ nginx_conf_dir }}/lokole-nginx.conf" # http://box/lokole file: - path: "{{ nginx_config_dir }}/lokole-nginx.conf" + path: "{{ nginx_conf_dir }}/lokole-nginx.conf" state: absent when: nginx_install and not lokole_enabled diff --git a/roles/mediawiki/tasks/enable.yml b/roles/mediawiki/tasks/enable.yml index 5f531f697..d086b7193 100644 --- a/roles/mediawiki/tasks/enable.yml +++ b/roles/mediawiki/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: Enable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by installing {{ nginx_config_dir }}/mediawiki-nginx.conf from template +- name: Enable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by installing {{ nginx_conf_dir }}/mediawiki-nginx.conf from template template: src: mediawiki-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/mediawiki-nginx.conf" + dest: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" when: nginx_install and mediawiki_enabled -- name: Disable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by removing {{ nginx_config_dir }}/mediawiki-nginx.conf +- name: Disable http://box{{ mediawiki_url }} & http://box{{ mediawiki_url2 }} via NGINX, by removing {{ nginx_conf_dir }}/mediawiki-nginx.conf file: - path: "{{ nginx_config_dir }}/mediawiki-nginx.conf" + path: "{{ nginx_conf_dir }}/mediawiki-nginx.conf" state: absent when: nginx_install and not mediawiki_enabled diff --git a/roles/moodle/tasks/enable.yml b/roles/moodle/tasks/enable.yml index c0afc6ca0..36f211c60 100644 --- a/roles/moodle/tasks/enable.yml +++ b/roles/moodle/tasks/enable.yml @@ -31,15 +31,15 @@ # NGINX -- name: Enable http://box/moodle via NGINX, by installing {{ nginx_config_dir }}/moodle-nginx.conf from template +- name: Enable http://box/moodle via NGINX, by installing {{ nginx_conf_dir }}/moodle-nginx.conf from template template: src: moodle-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/moodle-nginx.conf" + dest: "{{ nginx_conf_dir }}/moodle-nginx.conf" when: nginx_install and moodle_enabled -- name: Disable http://box/moodle via NGINX, by removing {{ nginx_config_dir }}/moodle-nginx.conf +- name: Disable http://box/moodle via NGINX, by removing {{ nginx_conf_dir }}/moodle-nginx.conf file: - path: "{{ nginx_config_dir }}/moodle-nginx.conf" + path: "{{ nginx_conf_dir }}/moodle-nginx.conf" state: absent when: nginx_install and not moodle_enabled diff --git a/roles/munin/tasks/nginx.yml b/roles/munin/tasks/nginx.yml index cbe4286bc..cd1094451 100644 --- a/roles/munin/tasks/nginx.yml +++ b/roles/munin/tasks/nginx.yml @@ -1,12 +1,12 @@ -- name: Enable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf from template +- name: Enable http://box/munin via NGINX, by installing {{ nginx_conf_dir }}/munin24-nginx.conf from template template: src: munin24-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d when: munin_enabled -- name: Disable http://box/munin via NGINX, by installing {{ nginx_config_dir }}/munin24-nginx.conf +- name: Disable http://box/munin via NGINX, by installing {{ nginx_conf_dir }}/munin24-nginx.conf file: - path: "{{ nginx_config_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d + path: "{{ nginx_conf_dir }}/munin24-nginx.conf" # /etc/nginx/conf.d state: absent when: not munin_enabled diff --git a/roles/nextcloud/tasks/enable.yml b/roles/nextcloud/tasks/enable.yml index 332669c8e..2170bc9a9 100644 --- a/roles/nextcloud/tasks/enable.yml +++ b/roles/nextcloud/tasks/enable.yml @@ -16,15 +16,15 @@ # NGINX -- name: "SHIM: Enable http://box{{ nextcloud_url }} via NGINX, by installing {{ nginx_config_dir }}/nextcloud-nginx.conf from template" # http://box/nextcloud +- name: "SHIM: Enable http://box{{ nextcloud_url }} via NGINX, by installing {{ nginx_conf_dir }}/nextcloud-nginx.conf from template" # http://box/nextcloud template: src: nextcloud-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/nextcloud-nginx.conf" + dest: "{{ nginx_conf_dir }}/nextcloud-nginx.conf" when: nginx_install and nextcloud_enabled -- name: "SHIM: Disable http://box{{ nextcloud_url }} via NGINX, by removing {{ nginx_config_dir }}/nextcloud-nginx.conf" # http://box/nextcloud +- name: "SHIM: Disable http://box{{ nextcloud_url }} via NGINX, by removing {{ nginx_conf_dir }}/nextcloud-nginx.conf" # http://box/nextcloud file: - path: "{{ nginx_config_dir }}/nextcloud-nginx.conf" + path: "{{ nginx_conf_dir }}/nextcloud-nginx.conf" state: absent when: nginx_install and not nextcloud_enabled diff --git a/roles/nginx/defaults/main.yml b/roles/nginx/defaults/main.yml index e9974baca..c7d736510 100644 --- a/roles/nginx/defaults/main.yml +++ b/roles/nginx/defaults/main.yml @@ -7,7 +7,7 @@ # nginx_port: 80 # nginx_interface: 0.0.0.0 -# nginx_config_dir: /etc/nginx/conf.d +# nginx_conf_dir: /etc/nginx/conf.d # nginx_log_dir: /var/log/nginx # All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index d2f57ffe3..567459612 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -1,18 +1,18 @@ -- name: Remove stale files (usb-lib.conf, modules.conf) from {{ nginx_config_dir }} +- name: Remove stale files (usb-lib.conf, modules.conf) from {{ nginx_conf_dir }} file: path: "{{ item.path }}" state: absent with_items: - { path: "/etc/systemd/system/uwsgi.service" } - - { path: "{{ nginx_config_dir }}/usb-lib.conf" } - - { path: "{{ nginx_config_dir }}/modules.conf" } + - { path: "{{ nginx_conf_dir }}/usb-lib.conf" } + - { path: "{{ nginx_conf_dir }}/modules.conf" } - name: Ensure that Apache (({{ apache_service }})) is not running -- we may need port swap systemd: name: "{{ apache_service }}" state: stopped -- name: "Install from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf, {{ nginx_config_dir }}/iiab.conf" +- name: "Install from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf, {{ nginx_conf_dir }}/iiab.conf" template: src: "{{ item.src}}" dest: "{{ item.dest }}" @@ -20,7 +20,7 @@ - { src: 'server.conf.j2', dest: '/etc/nginx/server.conf' } - { src: 'nginx.conf.j2', dest: '/etc/nginx/nginx.conf' } - { src: 'ports.conf.j2', dest: "/etc/{{ apache_service }}/ports.conf" } - - { src: 'iiab.conf.j2', dest: "{{ nginx_config_dir }}/iiab.conf" } + - { src: 'iiab.conf.j2', dest: "{{ nginx_conf_dir }}/iiab.conf" } when: nginx_enabled | bool # the below slides in nginx's proxypass config files for apache on localhost diff --git a/roles/nginx/tasks/uses_apache.yml.deprecated b/roles/nginx/tasks/uses_apache.yml.deprecated index 8c679b5e2..6a6356ad9 100644 --- a/roles/nginx/tasks/uses_apache.yml.deprecated +++ b/roles/nginx/tasks/uses_apache.yml.deprecated @@ -2,40 +2,40 @@ # 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 +- name: Install {{ nginx_conf_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_conf_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 +- name: Install {{ nginx_conf_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_conf_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 +- name: Install {{ nginx_conf_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_conf_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 +- name: Install {{ nginx_conf_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_conf_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 +- name: Install {{ nginx_conf_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_conf_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 +- name: Install {{ nginx_conf_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_conf_dir }}/nodered-nginx.conf" # /etc/nginx/conf.d # mode: '0666' when: nodered_enabled | bool diff --git a/roles/nginx/templates/server.conf.j2 b/roles/nginx/templates/server.conf.j2 index 4a8c7a6a1..6b42b1c14 100644 --- a/roles/nginx/templates/server.conf.j2 +++ b/roles/nginx/templates/server.conf.j2 @@ -6,7 +6,7 @@ server { index index.php index.html index.htm; # let individual services drop location blocks in conf.d - include {{ nginx_config_dir }}/*; + include {{ nginx_conf_dir }}/*; location ~ .*\.php$ { proxy_set_header X-Real-IP $remote_addr; diff --git a/roles/nodered/tasks/enable.yml b/roles/nodered/tasks/enable.yml index a6ba2d28c..d6eb9dba8 100644 --- a/roles/nodered/tasks/enable.yml +++ b/roles/nodered/tasks/enable.yml @@ -31,16 +31,16 @@ # NGINX -- name: "SHIM: Enable http://box/nodered_url via NGINX, by installing {{ nginx_config_dir }}/nodered-nginx.conf from template" +- name: "SHIM: Enable http://box/nodered_url via NGINX, by installing {{ nginx_conf_dir }}/nodered-nginx.conf from template" template: src: nodered-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/nodered-nginx.conf" + dest: "{{ nginx_conf_dir }}/nodered-nginx.conf" # mode: '0666' when: nginx_install and nodered_enabled -- name: "SHIM: Disable http://box/nodered_url via NGINX, by removing {{ nginx_config_dir }}/nodered-nginx.conf" +- name: "SHIM: Disable http://box/nodered_url via NGINX, by removing {{ nginx_conf_dir }}/nodered-nginx.conf" file: - path: "{{ nginx_config_dir }}/nodered-nginx.conf" + path: "{{ nginx_conf_dir }}/nodered-nginx.conf" state: absent when: nginx_install and not nodered_enabled diff --git a/roles/osm-vector-maps/tasks/main.yml b/roles/osm-vector-maps/tasks/main.yml index c6e53b3ae..b2b0c92ba 100644 --- a/roles/osm-vector-maps/tasks/main.yml +++ b/roles/osm-vector-maps/tasks/main.yml @@ -69,15 +69,15 @@ src: map_functions.js dest: "{{ vector_map_path }}/maplist/assets" -- name: Install {{ nginx_config_dir }}/osm-vector-maps.conf from template +- name: Install {{ nginx_conf_dir }}/osm-vector-maps.conf from template template: src: osm-vector-maps-nginx.conf - dest: "{{ nginx_config_dir }}/osm-vector-maps-nginx.conf" + dest: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" when: osm_vector_maps_enabled | bool -- name: Remove {{ nginx_config_dir }}/osm-vector-maps.conf +- name: Remove {{ nginx_conf_dir }}/osm-vector-maps.conf file: - path: "{{ nginx_config_dir }}/osm-vector-maps-nginx.conf" + path: "{{ nginx_conf_dir }}/osm-vector-maps-nginx.conf" state: absent when: not osm_vector_maps_enabled diff --git a/roles/sugarizer/tasks/enable.yml b/roles/sugarizer/tasks/enable.yml index e8b423540..37969819b 100644 --- a/roles/sugarizer/tasks/enable.yml +++ b/roles/sugarizer/tasks/enable.yml @@ -38,15 +38,15 @@ # NGINX -- name: Enable http://box/sugarizer via NGINX, by installing {{ nginx_config_dir }}/sugarizer-nginx.conf from template +- name: Enable http://box/sugarizer via NGINX, by installing {{ nginx_conf_dir }}/sugarizer-nginx.conf from template template: src: sugarizer-nginx.conf - dest: "{{ nginx_config_dir }}/sugarizer-nginx.conf" + dest: "{{ nginx_conf_dir }}/sugarizer-nginx.conf" when: nginx_install and sugarizer_enabled -- name: Disable http://box/sugarizer via NGINX, by removing {{ nginx_config_dir }}/sugarizer-nginx.conf +- name: Disable http://box/sugarizer via NGINX, by removing {{ nginx_conf_dir }}/sugarizer-nginx.conf file: - path: "{{ nginx_config_dir }}/sugarizer-nginx.conf" + path: "{{ nginx_conf_dir }}/sugarizer-nginx.conf" state: absent when: nginx_install and not sugarizer_enabled diff --git a/roles/wordpress/tasks/nginx.yml b/roles/wordpress/tasks/nginx.yml index 13058fbcc..348d06f45 100644 --- a/roles/wordpress/tasks/nginx.yml +++ b/roles/wordpress/tasks/nginx.yml @@ -1,12 +1,12 @@ -- name: Enable http://box{{ wp_url }} via NGINX, by installing {{ nginx_config_dir }}/wordpress-nginx.conf from template +- name: Enable http://box{{ wp_url }} via NGINX, by installing {{ nginx_conf_dir }}/wordpress-nginx.conf from template template: src: wordpress-nginx.conf.j2 - dest: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d + dest: "{{ nginx_conf_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d when: wordpress_enabled -- name: Disable http://box{{ wp_url }} via NGINX, by removing {{ nginx_config_dir }}/wordpress-nginx.conf +- name: Disable http://box{{ wp_url }} via NGINX, by removing {{ nginx_conf_dir }}/wordpress-nginx.conf file: - path: "{{ nginx_config_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d + path: "{{ nginx_conf_dir }}/wordpress-nginx.conf" # /etc/nginx/conf.d state: absent when: not wordpress_enabled diff --git a/vars/default_vars.yml b/vars/default_vars.yml index 230a3a449..7025ed4d5 100644 --- a/vars/default_vars.yml +++ b/vars/default_vars.yml @@ -243,7 +243,7 @@ nginx_install: True nginx_enabled: True nginx_port: 80 nginx_interface: 0.0.0.0 -nginx_config_dir: /etc/nginx/conf.d +nginx_conf_dir: /etc/nginx/conf.d nginx_log_dir: /var/log/nginx # See also Apache vars {default_language, language_priority} @ top of this file