Update Ansible to 2.9.12 and explicitly set mode on relevant tasks (#16)

alessfg · web-flow · commit 708cb298551b · 2020-09-01T16:35:24.000+02:00
diff --git a/.ansible-lint b/.ansible-lint
@@ -0,0 +1,2 @@
+skip_list:
+- '106'
diff --git a/.travis.yml b/.travis.yml
@@ -30,12 +30,16 @@ jobs:
     - name: "(CentOS) Install Stable Branch and Push Configuration"
       env:
         scenario: stable_push_centos
-before_install: sudo apt-get -qq update
+before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
 install:
-  - 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
+  - pip install ansible==2.9.12
+  - pip install ansible-lint==4.3.3
+  - pip install molecule==3.0.8
+  - pip install docker==4.3.1
 script:
   - molecule --version
   - ansible --version
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Changelog
 
-## 0.x (Unreleased)
+## 0.1.1 (Unreleased)
 
 ENHANCEMENTS:
 
+*   Update Ansible to `2.9.12` and Ansible Lint to `4.3.3`.
+*   Explicitly defined `mode` in relevant tasks.
 *   Improve configuration templating capabilities:
     *   Allow setting `access_log`/`access_log_location` to `off`.
     *   Add IP restriction for web servers
diff --git a/molecule/common/playbooks/default_verify.yml b/molecule/common/playbooks/default_verify.yml
@@ -26,18 +26,21 @@
     - name: Check default.conf exists
       stat:
         path: /etc/nginx/conf.d/default.conf
+      check_mode: yes
       register: stat_result
       failed_when: not stat_result.stat.exists
 
     - name: Check frontend_default.conf exists
       stat:
         path: /etc/nginx/conf.d/frontend_default.conf
+      check_mode: yes
       register: stat_result
       failed_when: not stat_result.stat.exists
 
     - name: Check backend_default.conf exists
       stat:
         path: /etc/nginx/conf.d/backend_default.conf
+      check_mode: yes
       register: stat_result
       failed_when: not stat_result.stat.exists
 
diff --git a/molecule/common/playbooks/module_verify.yml b/molecule/common/playbooks/module_verify.yml
@@ -21,5 +21,6 @@
     - name: Check default.conf does not exist
       stat:
         path: /etc/nginx/conf.d/default.conf
+      check_mode: yes
       register: stat_result
       failed_when: stat_result.stat.exists
diff --git a/molecule/common/playbooks/stable_push_verify.yml b/molecule/common/playbooks/stable_push_verify.yml
@@ -26,6 +26,7 @@
     - name: Check default.conf exists
       stat:
         path: /etc/nginx/conf.d/default.conf
+      check_mode: yes
       register: stat_result
       failed_when: not stat_result.stat.exists
 
diff --git a/molecule/common/requirements.yml b/molecule/common/requirements.yml
@@ -1,3 +1,4 @@
 ---
 roles:
-  - nginxinc.nginx
+  - name: nginxinc.nginx
+    version: 0.16.0
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: debian-stretch
     image: debian:stretch-slim
diff --git a/molecule/default_alpine/molecule.yml b/molecule/default_alpine/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: alpine-3.8
     image: alpine:3.8
diff --git a/molecule/default_centos/molecule.yml b/molecule/default_centos/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: centos-6
     image: centos:6
diff --git a/molecule/module/molecule.yml b/molecule/module/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: debian-stretch
     image: debian:stretch-slim
diff --git a/molecule/module_alpine/molecule.yml b/molecule/module_alpine/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: alpine-3.8
     image: alpine:3.8
diff --git a/molecule/module_centos/molecule.yml b/molecule/module_centos/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: centos-6
     image: centos:6
diff --git a/molecule/stable_push/molecule.yml b/molecule/stable_push/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: debian-stretch
     image: debian:stretch-slim
diff --git a/molecule/stable_push_alpine/molecule.yml b/molecule/stable_push_alpine/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: alpine-3.8
     image: alpine:3.8
diff --git a/molecule/stable_push_centos/molecule.yml b/molecule/stable_push_centos/molecule.yml
@@ -8,7 +8,7 @@ driver:
 lint: |
   set -e
   yamllint .
-  ansible-lint
+  ansible-lint --force-color
 platforms:
   - name: centos-6
     image: centos:6
diff --git a/tasks/conf/template-config.yml b/tasks/conf/template-config.yml
@@ -3,6 +3,7 @@
   file:
     path: "{{ item.value.html_file_location | default('/usr/share/nginx/html') }}"
     state: directory
+    mode: 0755
   with_dict: "{{ nginx_config_html_demo_template }}"
   when: nginx_config_html_demo_template_enable | bool
 
@@ -11,27 +12,31 @@
     src: "{{ item.value.template_file | default('www/index.html.j2') }}"
     dest: "{{ item.value.html_file_location | default('/usr/share/nginx/html') }}/{{ item.value.html_file_name | default('index.html') }}"
     backup: yes
+    mode: 0644
   with_dict: "{{ nginx_config_html_demo_template }}"
   when: nginx_config_html_demo_template_enable | bool
 
 - name: "(Setup: All NGINX) Ensure NGINX Main Directory Exists"
   file:
     path: "{{ nginx_config_main_template.conf_file_location | default('/etc/nginx') }}"
     state: directory
+    mode: 0755
   when: nginx_config_main_template_enable | bool
 
 - name: "(Setup: All NGINX) Dynamically Generate NGINX Main Configuration File"
   template:
     src: "{{ nginx_config_main_template.template_file | default('nginx.conf.j2') }}"
     dest: "{{ nginx_config_main_template.conf_file_location | default('/etc/nginx') }}/{{ nginx_config_main_template.conf_file_name | default('nginx.conf') }}"
     backup: yes
+    mode: 0644
   when: nginx_config_main_template_enable | bool
   notify: "(Handler: All OSs) Start NGINX"
 
 - name: "(Setup: All NGINX) Ensure NGINX HTTP Directory Exists"
   file:
     path: "{{ item.value.conf_file_location | default('/etc/nginx/conf.d/') }}"
     state: directory
+    mode: 0755
   with_dict: "{{ nginx_config_http_template }}"
   when: nginx_config_http_template_enable | bool
 
@@ -40,6 +45,7 @@
     path: "{{ item.1.path }}"
     state: directory
     owner: "{{ nginx_config_main_template.user | default('nginx') }}"
+    mode: 0755
   with_subelements:
     - "{{ nginx_config_http_template }}"
     - proxy_cache.proxy_cache_path
@@ -51,6 +57,7 @@
     src: "{{ item.value.template_file | default('http/default.conf.j2') }}"
     dest: "{{ item.value.conf_file_location | default('/etc/nginx/conf.d/') }}/{{ item.value.conf_file_name | default('default.conf') }}"
     backup: yes
+    mode: 0644
   with_dict: "{{ nginx_config_http_template }}"
   when: nginx_config_http_template_enable | bool
   notify: "(Handler: All OSs) Start NGINX"
@@ -60,6 +67,7 @@
     src: "{{ nginx_config_status_template_file | default('http/status.conf.j2') }}"
     dest: "{{ nginx_config_status_file_location | default('/etc/nginx/conf.d/status.conf') }}"
     backup: yes
+    mode: 0644
   notify: "(Handler: All OSs) Start NGINX"
   when: nginx_config_status_enable | bool
 
@@ -68,13 +76,15 @@
     src: "{{ nginx_config_rest_api_template_file | default('http/api.conf.j2') }}"
     dest: "{{ nginx_config_rest_api_file_location | default('/etc/nginx/conf.d/api.conf') }}"
     backup: yes
+    mode: 0644
   notify: "(Handler: All OSs) Start NGINX"
   when: nginx_config_rest_api_enable | bool
 
 - name: "(Setup: All NGINX) Ensure NGINX Stream Directory Exists"
   file:
     path: "{{ item.value.conf_file_location | default('/etc/nginx/conf.d/stream/') }}"
     state: directory
+    mode: 0755
   with_dict: "{{ nginx_config_stream_template }}"
   when: nginx_config_stream_template_enable | bool
 
@@ -83,6 +93,7 @@
     src: "{{ item.value.template_file | default('stream/default.conf.j2') }}"
     dest: "{{ item.value.conf_file_location | default('/etc/nginx/conf.d/stream/') }}/{{ item.value.conf_file_name | default('default.conf') }}"
     backup: yes
+    mode: 0644
   with_dict: "{{ nginx_config_stream_template }}"
   notify: "(Handler: All OSs) Start NGINX"
   when: nginx_config_stream_template_enable | bool
diff --git a/tasks/conf/upload-config.yml b/tasks/conf/upload-config.yml
@@ -3,27 +3,31 @@
   file:
     path: "{{ nginx_config_main_upload_dest | default('/etc/nginx/') }}"
     state: directory
+    mode: 0755
   when: nginx_config_main_upload_enable | bool
 
 - name: "(Setup: All NGINX) Upload NGINX Main Configuration File"
   copy:
     src: "{{ nginx_config_main_upload_src | default('conf/nginx.conf') }}"
     dest: "{{ nginx_config_main_upload_dest | default('/etc/nginx/') }}"
     backup: yes
+    mode: 0755
   when: nginx_config_main_upload_enable | bool
   notify: "(Handler: All OSs) Start NGINX"
 
 - name: "(Setup: All NGINX) Ensure NGINX HTTP Directory Exists"
   file:
     path: "{{ nginx_config_http_upload_dest | default('/etc/nginx/conf.d/') }}"
     state: directory
+    mode: 0755
   when: nginx_config_http_upload_enable | bool
 
 - name: "(Setup: All NGINX) Upload NGINX HTTP Configuration Files"
   copy:
     src: "{{ item }}"
     dest: "{{ nginx_config_http_upload_dest | default('/etc/nginx/conf.d/') }}"
     backup: yes
+    mode: 0644
   with_fileglob: "{{ nginx_config_http_upload_src }}"
   when: nginx_config_http_upload_enable | bool
   notify: "(Handler: All OSs) Start NGINX"
@@ -32,13 +36,15 @@
   file:
     path: "{{ nginx_config_stream_upload_dest | default('/etc/nginx/conf.d/') }}"
     state: directory
+    mode: 0755
   when: nginx_config_stream_upload_enable | bool
 
 - name: "(Setup: All NGINX) Upload NGINX Stream Configuration Files"
   copy:
     src: "{{ item }}"
     dest: "{{ nginx_config_stream_upload_dest | default('/etc/nginx/conf.d/') }}"
     backup: yes
+    mode: 0644
   with_fileglob: "{{ nginx_config_stream_upload_src }}"
   when: nginx_config_stream_upload_enable | bool
   notify: "(Handler: All OSs) Start NGINX"
@@ -47,13 +53,15 @@
   file:
     path: "{{ nginx_config_html_upload_dest | default('/usr/share/nginx/html') }}"
     state: directory
+    mode: 0755
   when: nginx_config_html_upload_enable | bool
 
 - name: "(Setup: All NGINX) Upload NGINX HTML Files"
   copy:
     src: "{{ item }}"
     dest: "{{ nginx_config_html_upload_dest | default('/usr/share/nginx/html') }}"
     backup: yes
+    mode: 0644
   with_fileglob: "{{ nginx_config_html_upload_src }}"
   when: nginx_config_html_upload_enable | bool
   notify: "(Handler: All OSs) Start NGINX"
@@ -62,31 +70,33 @@
   file:
     path: "{{ nginx_config_ssl_upload_crt_dest | default('/etc/ssl/certs/') }}"
     state: directory
+    mode: 0755
   when: nginx_config_ssl_upload_enable | bool
 
 - name: "(Setup: All NGINX) Ensure SSL Key Directory Exists"
   file:
     path: "{{ nginx_config_ssl_upload_key_dest | default('/etc/ssl/private/') }}"
     state: directory
+    mode: 0755
   when: nginx_config_ssl_upload_enable | bool
 
 - name: "(Setup: All NGINX) Upload NGINX SSL Certificates"
   copy:
     src: "{{ item }}"
     dest: "{{ nginx_config_ssl_upload_crt_dest | default('/etc/ssl/certs/') }}"
-    mode: 0640
     decrypt: yes
     backup: yes
+    mode: 0640
   with_fileglob: "{{ nginx_config_ssl_upload_crt_src }}"
   when: nginx_config_ssl_upload_enable | bool
 
 - name: "(Setup: All NGINX) Upload NGINX SSL Keys"
   copy:
     src: "{{ item }}"
     dest: "{{ nginx_config_ssl_upload_key_dest | default('/etc/ssl/private/') }}"
-    mode: 0640
     decrypt: yes
     backup: yes
+    mode: 0640
   with_fileglob: "{{ nginx_config_ssl_upload_key_src }}"
   no_log: yes
   when: nginx_config_ssl_upload_enable | bool
