Prepare 0.15.0 release (#300)

Author: alessfg

.gitignore

@@ -2,7 +2,6 @@
 ############################
 *.crt
 *.key
-__pycache__
 *~
 \#*
 
@@ -12,4 +11,7 @@ Thumbs.db
 .vscode
 
 # Ansible specific
-*.retry
+*.retry
+
+# Python specific
+__pycache__

.travis.yml

@@ -1,69 +1,68 @@
 ---
 language: python
-services:
-  - docker
+services: docker
 jobs:
   include:
-    - name: "Install Specific Version - Debian/Ubuntu"
+    - name: "(Debian/Ubuntu) Install Specific Version"
       env:
         scenario: default
-    - name: "Install Specific Version - Alpine"
+    - name: "(Alpine) Install Specific Version"
       env:
         scenario: default_alpine
-    - name: "Install Specific Version - CentOS"
+    - name: "(CentOS) Install Specific Version"
       env:
         scenario: default_centos
-    - name: "Install Modules - Debian/Ubuntu"
+    - name: "(Debian/Ubuntu) Install Modules"
       env:
         scenario: module
-    - name: "Install Modules - Alpine"
+    - name: "(Alpine) Install Modules"
       env:
         scenario: module_alpine
-    - name: "Install Modules - CentOS"
+    - name: "(CentOS) Install Modules"
       env:
         scenario: module_centos
-    - name: "Install Stable Branch and Push Configuration - Debian/Ubuntu"
+    - name: "(Debian/Ubuntu) Install Stable Branch and Push Configuration"
       env:
         scenario: stable_push
-    - name: "Install Stable Branch and Push Configuration - Alpine"
+    - name: "(Alpine) Install Stable Branch and Push Configuration"
       env:
         scenario: stable_push_alpine
-    - name: "Install Stable Branch and Push Configuration - CentOS"
+    - name: "(CentOS) Install Stable Branch and Push Configuration"
       env:
         scenario: stable_push_centos
-    - name: "Use Template Setting - Debian/Ubuntu"
+    - name: "(Debian/Ubuntu) Use Template Setting"
       env:
         scenario: template
-    - name: "Use Template Setting - Alpine"
+    - name: "(Alpine) Use Template Setting"
       env:
         scenario: template_alpine
-    - name: "Use Template Setting - CentOS"
+    - name: "(CentOS) Use Template Setting"
       env:
         scenario: template_centos
-    - name: "Install Unit - Debian/Ubuntu"
+    - name: "(Debian/Ubuntu) Install NGINX Unit"
       env:
         scenario: unit
-    - name: "Install Unit - Alpine"
+    - name: "(Alpine) Install NGINX Unit"
       env:
         scenario: unit_alpine
-    - name: "Install Unit - CentOS"
+    - name: "(CentOS) Install NGINX Unit"
       env:
         scenario: unit_centos
-    - name: "Install from Source - Debian/Ubuntu"
+    - name: "(Debian/Ubuntu) Install from Source"
       env:
         scenario: source
-    - name: "Install from Source - Alpine"
+    - name: "(Alpine) Install from Source"
       env:
         scenario: source_alpine
-    - name: "Install from Source - CentOS"
+    - name: "(CentOS) Install from Source"
       env:
         scenario: source_centos
-before_install:
-  - sudo apt-get -qq update
+before_install: sudo apt-get -qq update
 install:
-  - pip install ansible==2.9.9
-  - pip install molecule[docker]==3.0.4
-  - pip install ansible-lint
+  - pip install ansible==2.9.11
+  - pip install molecule==3.0.6
+  - pip install docker==4.2.2
+  - pip install ansible-lint==4.2.0
 script:
   - molecule --version
   - ansible --version

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.15.0 (Unreleased)
 
+DEPRECATION WARNING:
+
+*   NGINX now has a separate role to manage and create NGINX configurations available [here](https://github.com/nginxinc/ansible-role-nginx-config). Any new issues or PRs related to configuring NGINX should be submitted in the new NGINX Config repository. New issues or PRs related to configuring NGINX submitted in this repository will not be worked on. The NGINX configuration functionailities included in this role will be removed in an upcoming release.
+*   NGINX Unit now has a separate role available [here](https://github.com/nginxinc/ansible-role-nginx-unit). Any new issues or PRs related to NGINX Unit should be submitted in the new NGINX Unit repository. New issues or PRs related to NGINX Unit submitted in this repository will not be worked on. The NGINX Unit functionailities included in this role will be removed in an upcoming release.
+
 BREAKING CHANGES:
 
 *   The Debian and Ubuntu repositories have slightly changed. You may run into some duplication issues when running the role on a preexisting target that already has had NGINX installed using the role. To fix this, manually remove the old repository source.

CONTRIBUTING.md

@@ -26,7 +26,7 @@ Follow our [Installation Guide](https://github.com/nginxinc/ansible-role-nginx/b
 
 ### Project Structure
 
-*   The NGINX Ansible role is written in `yaml` and supports open source NGINX, NGINX Plus, NGINX Amplify, and NGINX Unit.
+*   The NGINX Ansible role is written in `yaml` and supports NGINX Open Source, NGINX Plus, NGINX Amplify, and NGINX Unit.
 *   The project follows the standard [Ansible role directory structure](https://docs.ansible.com/ansible/latest/user_guide/playbooks_reuse_roles.html)
     *   The main code is found in `tasks/`
     *   The main variables can be found in `defaults/main/*.yml`

README.md

@@ -8,6 +8,10 @@ This role installs NGINX Open Source, NGINX Plus, the NGINX Amplify agent, or NG
 
 **Note:** This role is still in active development. There may be unidentified issues and the role variables may change as development continues.
 
+**Deprecation Warnings:**
+*   NGINX now has a separate role to manage and create NGINX configurations available [here](https://github.com/nginxinc/ansible-role-nginx-config). Any new issues or PRs related to configuring NGINX should be submitted in the new NGINX Config repository. New issues or PRs related to configuring NGINX submitted in this repository will not be worked on. The NGINX configuration functionailities included in this role will be removed in an upcoming release.
+*   NGINX Unit now has a separate role available [here](https://github.com/nginxinc/ansible-role-nginx-unit). Any new issues or PRs related to NGINX Unit should be submitted in the new NGINX Unit repository. New issues or PRs related to NGINX Unit submitted in this repository will not be worked on. The NGINX Unit functionailities included in this role will be removed in an upcoming release.
+
 Requirements
 ------------
 
@@ -208,9 +212,11 @@ Do note that if you install this repository via Ansible Galaxy, you will have to
 Other NGINX Roles
 -----------------
 
-You can find an Ansible collection of roles to help you install and configure NGINX Controller [here](https://github.com/nginxinc/ansible-collection-nginx_controller)
+You can find an Ansible role to install and configure NGINX App Protect [here](https://github.com/nginxinc/ansible-role-nginx-app-protect)
+
+You can find an Ansible collection of roles to install and configure NGINX Controller [here](https://github.com/nginxinc/ansible-collection-nginx_controller)
 
-You can find an Ansible role to help you install and configure NGINX App Protect [here](https://github.com/nginxinc/ansible-role-nginx-app-protect)
+You can find an Ansible role to install NGINX Unit [here](https://github.com/nginxinc/ansible-role-nginx-unit)
 
 License
 -------
@@ -226,4 +232,4 @@ Author Information
 
 [Tom Gamull](https://github.com/magicalyak)
 
-© [NGINX, Inc.](https://www.nginx.com/) 2018 - 2020
+© [F5 Networks, Inc.](https://www.f5.com/) 2018 - 2020

defaults/main/bsd.yml

@@ -7,19 +7,19 @@ nginx_bsd_systems: ['FreeBSD', 'NetBSD', 'OpenBSD', 'DragonFlyBSD', 'HardenedBSD
 nginx_plus_bsd_systems: ['FreeBSD']
 
 # Choose to install BSD packages or ports.
-# Options are True for packages or False for ports.
-# Default is True.
+# Options are true for packages or false for ports.
+# Default is true.
 nginx_bsd_install_packages: true
 
 # Choose to update BSD ports collection.
-# Options are True for update or False for do not update.
-# Default is True.
+# Options are true for update or false for do not update.
+# Default is true.
 nginx_bsd_update_ports: true
 
 # Choose to install packages built from BSD ports collection if
 # available.
-# Options are True for use packages or False for do not use packages.
-# Default is True.
+# Options are true for use packages or false for do not use packages.
+# Default is true.
 nginx_bsd_portinstall_use_packages: true
 
 # FreeBSD extra packages

defaults/main/main.yml

@@ -105,7 +105,7 @@ nginx_cleanup_config_paths:
 # nginx_cleanup_config_files:
 #   - /etc/nginx/conf.d/default.conf
 
-# Set selinux enforcing for nginx (Centos/Redhat only) - you may need to open ports on your own
+# Set SELinux enforcing for NGINX (Centos/Redhat only) - you may need to open ports on your own
 nginx_selinux: false
 # Enable enforcing mode if true.  Permissive if false (audit only, no enforcing) globally (only works with nginx_selinux: true)
 nginx_selinux_enforcing: true

defaults/main/unit.yml

@@ -3,4 +3,4 @@
 # Use a list of supported NGINX Unit modules.
 # Default is false.
 nginx_unit_enable: false
-nginx_unit_modules: null
+nginx_unit_modules: []

molecule/common/files/www/.gitkeep renamed to files/www/.gitkeep

@@ -1,17 +1,15 @@
 ---
-# handlers file for ansible-role-nginx
 - name: "(Handler: All OSs) Check NGINX"
   command: "nginx -t"
   changed_when: false
 
-- name: "(Handler: All OSs) systemd daemon-reload"
+- name: "(Handler: All OSs) Systemd Daemon-Reload"
   systemd:
     daemon_reload: yes
   notify: "(Handler: All OSs) Start NGINX"
 
 - name: "(Handler: All OSs) Run NGINX"
   block:
-
     - name: "(Handler: All OSs) Start NGINX"
       service:
         name: nginx
@@ -22,7 +20,6 @@
     - name: "(Handler: All OSs) Reload NGINX"
       command: "nginx -s reload"
       changed_when: false
-
   when:
     - nginx_start | bool
     - not ansible_check_mode

files/www/index.html

@@ -2,7 +2,8 @@
 galaxy_info:
   author: Alessandro Fael Garcia
   description: Official Ansible role for NGINX
-  company: NGINX, Inc.
+  role_name: nginx
+  company: F5 Networks, Inc.
 
   license: Apache License, Version 2.0
 

handlers/main.yml

@@ -2,44 +2,46 @@
 - name: Converge
   hosts: all
   pre_tasks:
-    - name: "Set repo if Alpine"
+    - name: Set repo if Alpine
       set_fact:
         version: "=1.17.10-r1"
       when: ansible_os_family == "Alpine"
-    - name: "Set repo if Debian"
+    - name: Set repo if Debian
       set_fact:
         version: "=1.17.10-1~{{ ansible_distribution_release }}"
       when: ansible_os_family == "Debian"
-    - name: "Set repo if RedHat"
+    - name: Set repo if RedHat
       set_fact:
         version: "-1.17.10-1.el{{ ansible_distribution_major_version }}.ngx"
       when: ansible_os_family == "RedHat"
-    - name: "Enable Nginx @CentOS-AppStream dnf modules"
+    - name: Enable NGINX @CentOS-AppStream dnf modules
       shell:
       args:
         cmd: dnf module info nginx | grep -q 'Stream.*\[e\]' && echo -n ENABLED || dnf module enable -y nginx  # noqa 204 303
       register: dnf_module_enable
       changed_when: dnf_module_enable.stdout != 'ENABLED'
       when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "8"
-  roles:
-    - role: ansible-role-nginx
-  vars:
-    nginx_debug_output: true
-    nginx_selinux: true
-    nginx_selinux_tcp_ports:
-      - 80
-      - 443
-    nginx_version: "{{ version }}"
-    nginx_configure: false
-    nginx_logrotate_conf_enable: true
-    nginx_logrotate_conf:
-      paths:
-        - "/var/log/nginx/*.log"
-      options:
-        - daily
-        - missingok
-        - rotate 14
-        - compress
-        - delaycompress
-        - notifempty
-        - sharedscripts
+  tasks:
+    - name: Install NGINX
+      include_role:
+        name: ansible-role-nginx
+      vars:
+        nginx_debug_output: true
+        nginx_selinux: true
+        nginx_selinux_tcp_ports:
+          - 80
+          - 443
+        nginx_version: "{{ version }}"
+        nginx_configure: false
+        nginx_logrotate_conf_enable: true
+        nginx_logrotate_conf:
+          paths:
+            - "/var/log/nginx/*.log"
+          options:
+            - daily
+            - missingok
+            - rotate 14
+            - compress
+            - delaycompress
+            - notifempty
+            - sharedscripts