Merge pull request #49 from nginxinc/(bug)/fix-modules

Refactor and fix module installation
This commit is contained in:
Alessandro Fael Garcia 2018-08-03 11:23:14 -07:00 committed by GitHub
commit 9f34575ded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 22 deletions

View File

@ -14,26 +14,8 @@
- import_tasks: plus/install-plus.yml - import_tasks: plus/install-plus.yml
when: type == "plus" when: type == "plus"
- import_tasks: modules/install-njs.yml - import_tasks: modules/install-modules.yml
when: modules.njs when: true in modules.values()
- import_tasks: modules/install-perl.yml
when: modules.perl
- import_tasks: modules/install-geoip.yml
when: modules.geoip
- import_tasks: modules/install-image-filter.yml
when: modules.image_filter
- import_tasks: modules/install-rtmp.yml
when: modules.rtmp
- import_tasks: modules/install-xslt.yml
when: modules.xslt
- import_tasks: modules/install-waf.yml
when: modules.waf and type == "plus"
- import_tasks: conf/push-config.yml - import_tasks: conf/push-config.yml
when: main_push_enable or http_push_enable or stream_push_enable when: main_push_enable or http_push_enable or stream_push_enable

View File

@ -1,13 +1,13 @@
--- ---
- name: "(Install: All OSs) Install NGINX Open Source GeoIP Module" - name: "(Install: All OSs) Install NGINX Open Source GeoIP Module"
package: package:
name: nginx-geoip-perl name: nginx-module-geoip
state: present state: present
when: type == "opensource" when: type == "opensource"
- name: "(Install: All OSs) Install NGINX Plus GeoIP Module" - name: "(Install: All OSs) Install NGINX Plus GeoIP Module"
package: package:
name: nginx-plus-geoip-perl name: nginx-plus-module-geoip
state: present state: present
when: type == "plus" when: type == "plus"

View File

@ -0,0 +1,21 @@
---
- import_tasks: install-njs.yml
when: modules.njs | default(false)
- import_tasks: install-perl.yml
when: modules.perl | default(false)
- import_tasks: install-geoip.yml
when: modules.geoip | default(false)
- import_tasks: install-image-filter.yml
when: modules.image_filter | default(false)
- import_tasks: install-rtmp.yml
when: modules.rtmp | default(false)
- import_tasks: install-xslt.yml
when: modules.xslt | default(false)
- import_tasks: install-waf.yml
when: modules.waf | default(false) and type == "plus"