From 67c8be81068fda346ba665271d40c5d2c6fbf9ae Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 25 Sep 2018 22:42:06 -0500
Subject: [PATCH] Fix some Ansible Lint issues and set up yaml-lint options.

---
 defaults/main.yml              |  5 +++--
 handlers/main.yml              |  2 +-
 meta/main.yml                  | 26 +++++++++++++-------------
 molecule/default/molecule.yml  |  2 ++
 molecule/default/yaml-lint.yml |  6 ++++++
 tasks/setup-Ubuntu.yml         |  2 +-
 tasks/vhosts.yml               |  6 +++++-
 7 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 molecule/default/yaml-lint.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index 73100c5..1a14c16 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,7 +15,8 @@ nginx_package_name: "nginx"
 nginx_conf_template: "nginx.conf.j2"
 nginx_vhost_template: "vhost.j2"
 
-nginx_worker_processes: "{{ ansible_processor_vcpus | default(ansible_processor_count) }}"
+nginx_worker_processes: >-
+  "{{ ansible_processor_vcpus | default(ansible_processor_count) }}"
 nginx_worker_connections: "1024"
 nginx_multi_accept: "off"
 
@@ -59,7 +60,7 @@ nginx_vhosts: []
 #   server_name: "example.com" # default: N/A
 #   root: "/var/www/example.com" # default: N/A
 #   index: "index.html index.htm" # default: "index.html index.htm"
-#   filename: "example.com.conf" # Can be used to set the filename of the vhost file.
+#   filename: "example.com.conf" # Can be used to set the vhost filename.
 #
 #   # Properties that are only added if defined:
 #   server_name_redirect: "www.example.com" # default: N/A
diff --git a/handlers/main.yml b/handlers/main.yml
index 3f6d024..2db781e 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,7 +4,7 @@
 
 - name: validate nginx configuration
   command: nginx -t -c /etc/nginx/nginx.conf
-  changed_when: False
+  changed_when: false
 
 - name: reload nginx
   service: name=nginx state=reloaded
diff --git a/meta/main.yml b/meta/main.yml
index da5e348..b258974 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -10,29 +10,29 @@ galaxy_info:
   platforms:
     - name: EL
       versions:
-      - 6
-      - 7
+        - 6
+        - 7
     - name: Debian
       versions:
-      - all
+        - all
     - name: Ubuntu
       versions:
-      - trusty
-      - xenial
+        - trusty
+        - xenial
     - name: Archlinux
       versions:
-      - all
+        - all
     - name: FreeBSD
       versions:
-      - 10.3
-      - 10.2
-      - 10.1
-      - 10.0
-      - 9.3
+        - 10.3
+        - 10.2
+        - 10.1
+        - 10.0
+        - 9.3
     - name: OpenBSD
       versions:
-      - 5.9
-      - 6.0
+        - 5.9
+        - 6.0
   galaxy_tags:
     - development
     - web
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index e3d6e33..0339702 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -5,6 +5,8 @@ driver:
   name: docker
 lint:
   name: yamllint
+  options:
+    config-file: molecule/default/yaml-lint.yml
 platforms:
   - name: instance
     image: geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible
diff --git a/molecule/default/yaml-lint.yml b/molecule/default/yaml-lint.yml
new file mode 100644
index 0000000..a3dbc38
--- /dev/null
+++ b/molecule/default/yaml-lint.yml
@@ -0,0 +1,6 @@
+---
+extends: default
+rules:
+  line-length:
+    max: 120
+    level: warning
diff --git a/tasks/setup-Ubuntu.yml b/tasks/setup-Ubuntu.yml
index 920dc0b..e198062 100644
--- a/tasks/setup-Ubuntu.yml
+++ b/tasks/setup-Ubuntu.yml
@@ -3,7 +3,7 @@
   apt_repository:
     repo: 'ppa:nginx/{{ nginx_ppa_version }}'
     state: present
-    update_cache: yes
+    update_cache: true
   register: nginx_ppa_added
   when: nginx_ppa_use
 
diff --git a/tasks/vhosts.yml b/tasks/vhosts.yml
index 05af037..f497216 100644
--- a/tasks/vhosts.yml
+++ b/tasks/vhosts.yml
@@ -16,13 +16,15 @@
   template:
     src: "{{ item.template|default(nginx_vhost_template) }}"
     dest: "{{ nginx_vhost_path }}/{{ item.filename|default(item.server_name.split(' ')[0] ~ '.conf') }}"
-    force: yes
+    force: true
     owner: root
     group: root
     mode: 0644
   when: item.state|default('present') != 'absent'
   with_items: "{{ nginx_vhosts }}"
   notify: reload nginx
+  tags:
+    - skip_ansible_lint
 
 - name: Remove managed vhost config files.
   file:
@@ -31,6 +33,8 @@
   when: item.state|default('present') == 'absent'
   with_items: "{{ nginx_vhosts }}"
   notify: reload nginx
+  tags:
+    - skip_ansible_lint
 
 - name: Remove legacy vhosts.conf file.
   file: