Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -25,7 +25,7 @@ script:
   - 'docker exec ${container_id} bash -c "echo Success >| /var/www/test/index.html"'
 
   # Make sure virtualhost exists.
-  - 'docker exec --tty ${container_id} env TERM=xterm curl http://test.dev/ | grep "Success"'
+  - 'docker exec --tty ${container_id} env TERM=xterm curl http://localhost/ | grep "Success"'
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nginx.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nginx)
 
+**Note:** Please consider using the official [NGINX Ansible role](https://github.com/nginxinc/ansible-role-nginx) from NGINX, Inc.
+
 Installs Nginx on RedHat/CentOS, Debian/Ubuntu, Archlinux, FreeBSD or OpenBSD servers.
 
 This role installs and configures the latest version of Nginx from the Nginx yum repository (on RedHat-based systems), apt (on Debian-based systems), pacman (Archlinux), pkgng (on FreeBSD systems) or pkg_add (on OpenBSD systems). You will likely need to do extra setup work after this role has installed Nginx, like adding your own [virtualhost].conf file inside `/etc/nginx/conf.d/`, describing the location and options to use for your particular website.

meta/main.yml

@@ -6,7 +6,7 @@ galaxy_info:
   description: Nginx installation for Linux, FreeBSD and OpenBSD.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 1.8
+  min_ansible_version: 2.4
   platforms:
     - name: EL
       versions:
@@ -36,3 +36,8 @@ galaxy_info:
   galaxy_tags:
     - development
     - web
+    - nginx
+    - reverse
+    - proxy
+    - load
+    - balancer

tasks/main.yml

@@ -9,26 +9,26 @@
   when: nginx_user is not defined
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
+- include_tasks: setup-RedHat.yml
   when: ansible_os_family == 'RedHat'
 
-- include: setup-Ubuntu.yml
+- include_tasks: setup-Ubuntu.yml
   when: ansible_distribution == 'Ubuntu'
 
-- include: setup-Debian.yml
+- include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- include: setup-FreeBSD.yml
+- include_tasks: setup-FreeBSD.yml
   when: ansible_os_family == 'FreeBSD'
 
-- include: setup-OpenBSD.yml
+- include_tasks: setup-OpenBSD.yml
   when: ansible_os_family == 'OpenBSD'
 
-- include: setup-Archlinux.yml
+- include_tasks: setup-Archlinux.yml
   when: ansible_os_family == 'Archlinux'
 
 # Vhost configuration.
-- include: vhosts.yml
+- import_tasks: vhosts.yml
 
 # Nginx setup.
 - name: Copy nginx configuration in place.

tasks/setup-Archlinux.yml

@@ -2,4 +2,4 @@
 - name: Ensure nginx is installed.
   pacman:
     name: "{{ nginx_package_name }}"
-    state: installed
+    state: present

tasks/setup-Debian.yml

@@ -6,5 +6,5 @@
 - name: Ensure nginx is installed.
   apt:
     name: "{{ nginx_package_name }}"
-    state: installed
+    state: present
     default_release: "{{ nginx_default_release }}"

tasks/setup-RedHat.yml

@@ -11,4 +11,4 @@
 - name: Ensure nginx is installed.
   yum:
     name: "{{ nginx_package_name }}"
-    state: installed
+    state: present