Update documentation and controller variables

README.md

@@ -17,7 +17,7 @@ Use `ansible-galaxy install nginxinc.nginx` to install the role on your system.
 
 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/):
 
-**NGINX Open Source:**
+**NGINX Open Source**
 
 ```yaml
 CentOS:
@@ -47,7 +47,7 @@ FreeBSD:
     - 11
 ```
 
-**NGINX Plus:**
+**NGINX Plus**
 
 ```yaml
 CentOS:
@@ -84,7 +84,52 @@ FreeBSD:
     - 11
 ```
 
-**NGINX Unit:**
+**NGINX Amplify**
+
+```yaml
+CentOS:
+  versions:
+    - 6
+    - 7
+RedHat:
+  versions:
+    - 6
+    - 7
+Debian:
+  versions:
+    - jessie
+    - stretch
+Ubuntu:
+  versions:
+    - trusty
+    - xenial
+    - artful
+    - bionic
+Amazon Linux:
+  versions:
+    - 2017.09
+```
+
+**NGINX Controller**
+
+```yaml
+CentOS:
+  versions:
+    - 7
+RedHat:
+  versions:
+    - 7
+Debian:
+  versions:
+    - jessie
+    - stretch
+Ubuntu:
+  versions:
+    - xenial
+    - artful
+```
+
+**NGINX Unit**
 
 ```yaml
 CentOS:
@@ -154,6 +199,16 @@ nginx_repository:
 # Default is mainline.
 branch: mainline
 
+# Location of your NGINX Plus license in your local machine.
+# Default is the files folder within the NGINX Ansible role.
+license:
+  certificate: license/nginx-repo.crt
+  key: license/nginx-repo.key
+
+# Delete NGINX Plus license after installation for security purposes.
+# Default is true.
+delete_license: true
+
 # Install NGINX JavaScript, Perl, ModSecurity WAF (NGINX Plus only), GeoIP, Image-Filter, RTMP Media Streaming, and/or XSLT modules.
 # Default is false.
 modules:
@@ -171,27 +226,32 @@ modules:
 amplify_enable: false
 amplify_key: null
 
+# Install NGINX Controller.
+# Use your NGINX Controller API key and NGINX Controller API endpoint.
+# Requires NGINX Plus.
+# Default is null.
+controller_enable: false
+controller_api_key: null
+controller_api_endpoint: null
+
+# Install NGINX Unit and NGINX Unit modules.
+# Use a list of supported NGINX Unit modules.
+# Default is false.
+unit_enable: false
+unit_modules: null
+
 # Enable NGINX status data.
 # Will enable 'stub_status' in NGINX Open Source and 'status' in NGINX Plus.
 # Default is false.
 status_enable: false
 
 # Enable NGINX Plus REST API, write access to the REST API, and NGINX Plus dashboard.
+# Requires NGINX Plus.
 # Default is false.
 rest_api_enable: false
 rest_api_write: false
 rest_api_dashboard: false
 
-# Location of your NGINX Plus license in your local machine.
-# Default is the files folder within the NGINX Ansible role.
-license:
-  certificate: license/nginx-repo.crt
-  key: license/nginx-repo.key
-
-# Delete NGINX Plus license after installation for security purposes.
-# Default is true.
-delete_license: true
-
 # Enable uploading NGINX configuration files to your system.
 # Default for uploading files is false.
 # Default location of files is the files folder within the NGINX Ansible role.
@@ -215,12 +275,6 @@ http_template_listen: 80
 http_template_server_name: localhost
 stream_template_enable: false
 stream_template_listen: 12345
-
-# Install NGINX Unit and NGINX Unit modules.
-# Use a list of supported NGINX Unit modules.
-# Default is false.
-unit_enable: false
-unit_modules: null
 ```
 
 Dependencies
@@ -241,6 +295,16 @@ This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a
     - role: nginxinc.nginx
 ```
 
+This is a sample playbook file for deploying the Ansible Galaxy NGINX role to a dynamic inventory containing the `nginx` tag.
+
+```yaml
+---
+- hosts: tag_nginx
+  remote_user: root
+  roles:
+    - role: nginxinc.nginx
+```
+
 This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a localhost and installing NGINX Plus.
 
 ```yaml
@@ -253,19 +317,23 @@ This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a
     type: plus
 ```
 
-This is a sample playbook file for deploying the Ansible Galaxy NGINX role to a dynamic inventory containing the `nginx` tag.
+This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a localhost to install NGINX Plus and the NGINX Controller agent.
 
-```yml
+```yaml
----
+- hosts: localhost
-- hosts: tag_nginx
+  become: true
-  remote_user: root
   roles:
     - role: nginxinc.nginx
+  vars:
+    type: plus
+    controller_enable: true
+    controller_api_key: <API_KEY_HERE>
+    controller_api_endpoint: https://<FQDN>/1.4
 ```
 
 This is a sample playbook file for deploying the Ansible Galaxy NGINX role in a localhost to install NGINX Unit and the PHP/Perl NGINX Unit language modules.
 
-```yml
+```yaml
 ---
 - hosts: localhost
   become: true

defaults/main.yml

@@ -32,6 +32,16 @@ nginx_repository:
 # Default is mainline.
 branch: mainline
 
+# Location of your NGINX Plus license in your local machine.
+# Default is the files folder within the NGINX Ansible role.
+license:
+  certificate: license/nginx-repo.crt
+  key: license/nginx-repo.key
+
+# Delete NGINX Plus license after installation for security purposes.
+# Default is true.
+delete_license: true
+
 # Install NGINX JavaScript, Perl, ModSecurity WAF (NGINX Plus only), GeoIP, Image-Filter, RTMP Media Streaming, and/or XSLT modules.
 # Default is false.
 modules:
@@ -50,11 +60,18 @@ amplify_enable: false
 amplify_key: null
 
 # Install NGINX Controller.
-# Use your NGINX Controller API key.
+# Use your NGINX Controller API key and NGINX Controller API endpoint.
+# Requires NGINX Plus.
 # Default is null.
 controller_enable: false
-controller_license: null
+controller_api_key: null
-controller_api_url: null
+controller_api_endpoint: null
+
+# Install NGINX Unit and NGINX Unit modules.
+# Use a list of supported NGINX Unit modules.
+# Default is false.
+unit_enable: false
+unit_modules: null
 
 # Enable NGINX status data.
 # Will enable 'stub_status' in NGINX Open Source and 'status' in NGINX Plus.
@@ -62,21 +79,12 @@ controller_api_url: null
 status_enable: false
 
 # Enable NGINX Plus REST API, write access to the REST API, and NGINX Plus dashboard.
+# Requires NGINX Plus.
 # Default is false.
 rest_api_enable: false
 rest_api_write: false
 rest_api_dashboard: false
 
-# Location of your NGINX Plus license in your local machine.
-# Default is the files folder within the NGINX Ansible role.
-license:
-  certificate: license/nginx-repo.crt
-  key: license/nginx-repo.key
-
-# Delete NGINX Plus license after installation for security purposes.
-# Default is true.
-delete_license: true
-
 # Enable uploading NGINX configuration files to your system.
 # Default for uploading files is false.
 # Default location of files is the files folder within the NGINX Ansible role.
@@ -100,9 +108,3 @@ http_template_listen: 80
 http_template_server_name: localhost
 stream_template_enable: false
 stream_template_listen: 12345
-
-# Install NGINX Unit and NGINX Unit modules.
-# Use a list of supported NGINX Unit modules.
-# Default is false.
-unit_enable: false
-unit_modules: null

meta/main.yml

@@ -34,14 +34,18 @@ galaxy_info:
 
   galaxy_tags:
     - nginx
-    - amplify
+    - nginx-oss
-    - controller
     - oss
+    - nginx-plus
     - plus
+    - nginx-amplify
+    - amplify
+    - nginx-controller
+    - controller
+    - nginx-unit
+    - unit
     - web
     - server
-    - unit
     - development
-    - web
 
 dependencies: []

tasks/controller/install-controller.yml

@@ -26,13 +26,13 @@
   lineinfile:
     dest: /etc/controller-agent/agent.conf
     regexp: api_key =.*
-    line: "api_key = {{ controller_license }}"
+    line: "api_key = {{ controller_api_key }}"
 
 - name: "(Setup: All OSs) Configure NGINX Controller Agent API URL"
   lineinfile:
     dest: /etc/controller-agent/agent.conf
     regexp: api_url =.*
-    line: "api_url = {{ controller_api_url }}"
+    line: "api_url = {{ controller_api_endpoint }}"
 
 - name: "(Setup: All OSs) Configure NGINX Controller Agent API Hostname"
   lineinfile: