diff --git a/README.md b/README.md index d19762a..6ad524e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Ansible NGINX Role [![Ansible Galaxy](https://img.shields.io/badge/galaxy-nginxinc.nginx-5bbdbf.svg)](https://galaxy.ansible.com/nginxinc/nginx) [![Build Status](https://travis-ci.org/nginxinc/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/nginxinc/ansible-role-nginx) -This role installs open source NGINX or NGINX Plus on your target host. +This role installs NGINX Open Source or NGINX Plus on your target host. Requirements ------------ @@ -13,9 +13,9 @@ This role was developed using Ansible 2.4.0.0. Backwards compatibility is not gu Use `ansible-galaxy install nginxinc.nginx` to install the role on your system. -It supports all platforms supported by [open source NGINX](https://nginx.org/en/linux_packages.html#mainline) and [NGINX Plus](https://www.nginx.com/products/technical-specs/): +It supports all platforms supported by [NGINX Open Source](https://nginx.org/en/linux_packages.html#mainline) and [NGINX Plus](https://www.nginx.com/products/technical-specs/): -**Open Source NGINX:** +**NGINX Open Source:** CentOS: versions: @@ -84,7 +84,7 @@ This role has multiple variables. The defaults for all these variables are the f # Default is 'opensource'. type: opensource - # Specify which branch of Open Source NGINX you want to install. + # Specify which branch of NGINX Open Source you want to install. # Options are 'mainline' or 'stable'. # Default is mainline. branch: mainline @@ -107,7 +107,7 @@ This role has multiple variables. The defaults for all these variables are the f amplify_key: null # Enable NGINX status data. - # Will enable 'stub_status' in open source NGINX and 'status' in NGINX Plus. + # Will enable 'stub_status' in NGINX Open Source and 'status' in NGINX Plus. # Default is false. status_enable: false diff --git a/defaults/main.yml b/defaults/main.yml index 355865e..10fb067 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,12 +4,12 @@ # Default is 'opensource'. type: opensource -# Specify which branch of Open Source NGINX you want to install. +# Specify which branch of NGINX Open Source you want to install. # Options are 'mainline' or 'stable'. # Default is mainline. branch: mainline -# Install nginscript, perl, waf (NGINX Plus only), geoip, image-filter, rtmp and/or xslt modules. +# Install NGINX JavaScript, Perl, ModSecurity WAF (NGINX Plus only), GeoIP, Image-Filter, RTMP Media Streaming, and/or XSLT modules. # Default is false. modules: njs: false @@ -27,7 +27,7 @@ amplify_enable: false amplify_key: null # Enable NGINX status data. -# Will enable 'stub_status' in open source NGINX and 'status' in NGINX Plus. +# Will enable 'stub_status' in NGINX Open Source and 'status' in NGINX Plus. # Default is false. status_enable: false diff --git a/tasks/conf/setup-status.yml b/tasks/conf/setup-status.yml index 1b1a4a9..e1f609a 100644 --- a/tasks/conf/setup-status.yml +++ b/tasks/conf/setup-status.yml @@ -1,5 +1,5 @@ --- -- name: "(Setup: Open Source NGINX) Enable Open Source NGINX Status" +- name: "(Setup: NGINX Open Source) Enable NGINX Open Source Status" blockinfile: path: "{{ (http_template_enable) | ternary('/etc/nginx/conf.d/http/stub_status.conf','/etc/nginx/conf.d/stub_status.conf') }}" create: yes diff --git a/tasks/modules/install-geoip.yml b/tasks/modules/install-geoip.yml index 29ca8aa..387c77c 100644 --- a/tasks/modules/install-geoip.yml +++ b/tasks/modules/install-geoip.yml @@ -1,5 +1,5 @@ --- -- name: "(Install: All OSs) Install Open Source NGINX GeoIP Module" +- name: "(Install: All OSs) Install NGINX Open Source GeoIP Module" package: name: nginx-geoip-perl state: present diff --git a/tasks/modules/install-image-filter.yml b/tasks/modules/install-image-filter.yml index 8072617..ab89bc6 100644 --- a/tasks/modules/install-image-filter.yml +++ b/tasks/modules/install-image-filter.yml @@ -1,5 +1,5 @@ --- -- name: "(Install: All OSs) Install Open Source NGINX Image Filter Module" +- name: "(Install: All OSs) Install NGINX Open Source Image Filter Module" package: name: nginx-module-image-filter state: present diff --git a/tasks/modules/install-njs.yml b/tasks/modules/install-njs.yml index 6216308..54ab926 100644 --- a/tasks/modules/install-njs.yml +++ b/tasks/modules/install-njs.yml @@ -1,17 +1,17 @@ --- -- name: "(Install: All OSs) Install Open Source NGINX NJS Module" +- name: "(Install: All OSs) Install NGINX Open Source JavaScript Module" package: name: nginx-module-njs state: present when: type == "opensource" -- name: "(Install: All OSs) Install NGINX Plus NJS Module" +- name: "(Install: All OSs) Install NGINX Plus JavaScript Module" package: name: nginx-plus-module-njs state: present when: type == "plus" -- name: "(Setup: All NGINX) Load NGINX NJS Module" +- name: "(Setup: All NGINX) Load NGINX JavaScript Module" blockinfile: path: /etc/nginx/nginx.conf insertbefore: BOF diff --git a/tasks/modules/install-perl.yml b/tasks/modules/install-perl.yml index 5adf910..e14ef06 100644 --- a/tasks/modules/install-perl.yml +++ b/tasks/modules/install-perl.yml @@ -1,5 +1,5 @@ --- -- name: "(Install: All OSs) Install Open Source NGINX Perl Module" +- name: "(Install: All OSs) Install NGINX Open Source Perl Module" package: name: nginx-module-perl state: present diff --git a/tasks/modules/install-rtmp.yml b/tasks/modules/install-rtmp.yml index b08626f..70c7831 100644 --- a/tasks/modules/install-rtmp.yml +++ b/tasks/modules/install-rtmp.yml @@ -1,5 +1,5 @@ --- -- name: "(Install: All OSs) Install Open Source NGINX RTMP Module" +- name: "(Install: All OSs) Install NGINX Open Source RTMP Module" package: name: nginx-module-rtmp state: present diff --git a/tasks/modules/install-xslt.yml b/tasks/modules/install-xslt.yml index 206852c..270d115 100644 --- a/tasks/modules/install-xslt.yml +++ b/tasks/modules/install-xslt.yml @@ -1,5 +1,5 @@ --- -- name: "(Install: All OSs) Install Open Source NGINX XSLT Module" +- name: "(Install: All OSs) Install NGINX Open Source XSLT Module" package: name: nginx-module-xslt state: present