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

Refine @jvonau\'s \'Move NGINX shims to roles\'

Browse source
This commit is contained in:
root 2020-01-12 12:12:49 -05:00
parent ef93b30370
commit fff83cd5fb
22 changed files with 223 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

30
roles/nginx/tasks/main.yml
View file

@ -1,7 +1,7 @@
- name: Remove stale files (usb-lib.conf, modules.conf) from {{ nginx_config_dir }}
file:
state: absent
path: "{{ item.path }}"
path: "{{ item.path }}"
state: absent
with_items:
- { path: "{{ nginx_config_dir }}/usb-lib.conf" }
- { path: "{{ nginx_config_dir }}/modules.conf" }
@ -13,43 +13,43 @@
- name: "Install from template: /etc/nginx/server.conf, /etc/nginx/nginx.conf, /etc/{{ apache_service }}/ports.conf, {{ nginx_config_dir }}/iiab.conf"
template:
src: "{{ item.src}}"
dest: "{{ item.dest }}"
src: "{{ item.src}}"
dest: "{{ item.dest }}"
with_items:
- { src: "server.conf", dest: "/etc/nginx/" }
- { src: "nginx.conf", dest: "/etc/nginx/" }
- { src: "ports.conf", dest: "/etc/{{ apache_service }}/" }
- { src: "iiab.conf.j2", dest: "{{ nginx_config_dir }}/iiab.conf" }
- { src: 'server.conf', dest: '/etc/nginx/' }
- { src: 'nginx.conf', dest: '/etc/nginx/' }
- { src: 'ports.conf', dest: "/etc/{{ apache_service }}/" }
- { src: 'iiab.conf.j2', dest: "{{ nginx_config_dir }}/iiab.conf" }
when: nginx_enabled | bool
# the below slides in nginx's proxypass config files for apache on localhost
# via the ports.conf file installed above
#- name: Install proxpass to apache running on localhost port {{ apache_port }}
#- name: Install proxpass to Apache running on localhost port {{ apache_port }}
# include_tasks: uses_apache.yml
# when: apache_enabled
# when: apache_enabled | bool
# the below task contains the same logic contained in the playbooks to enable
# 'runrole nginx' to do the right thing but with the 'src' path set to role's
# templates path ie roles/<rolename>/template/
#- name: Install proxpass to other services 'dual mode' roles
# include_tasks: only_nginx.yml
# when: nginx_enabled
# when: nginx_enabled | bool
- name: Stop and disable NGINX when not nginx_enabled
- name: Stop and disable NGINX, when not nginx_enabled
systemd:
name: nginx
state: stopped
enabled: false
when: not nginx_enabled
- name: Disable Apache port {{ apache_port }} localhost only
- name: Disable Apache port {{ apache_port }} localhost only, when not nginx_enabled
template:
dest: /etc/{{ apache_service }}/ports.conf
src: stock-apache-ports.conf
when: not nginx_enabled
# should have the logic to handle both modes in the playbook
#- name: Enable Apache (a2ensite) for 'dual mode' for the role when NGINX is diabled
#- name: Enable Apache (a2ensite) for 'dual mode' for the role when NGINX is disabled
# include_tasks: disable.yml
# when: not nginx_enabled
@ -59,7 +59,7 @@
daemon_reload: yes
state: restarted
enabled: true
when: apache_enabled | bool or not nginx_enabled | bool
when: apache_enabled or not nginx_enabled
- name: Enable & Restart NGINX, to pick up the config files installed
systemd: