external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

Rename var nginx_config_dir to nginx_conf_dir

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

10
roles/nginx/tasks/main.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

24
roles/nginx/tasks/uses_apache.yml.deprecated
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