1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-12 19:22:24 +00:00

Rename var nginx_config_dir to nginx_conf_dir

This commit is contained in:
root 2020-01-24 01:08:42 -05:00
parent 9d4dd4c4fd
commit b7151fe047
21 changed files with 84 additions and 84 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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;

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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