Add support for Alpine 3.12 (#23)

Author: alessfg

.travis.yml

@@ -3,6 +3,15 @@ language: python
 services: docker
 jobs:
   include:
+    - name: "(Debian/Ubuntu) Cleanup config and try to install modules"
+      env:
+        scenario: cleanup_module
+    - name: "(Alpine) Cleanup config and try to install modules"
+      env:
+        scenario: cleanup_module_alpine
+    - name: "(CentOS) Cleanup config and try to install modules"
+      env:
+        scenario: cleanup_module_centos
     - name: "(Debian/Ubuntu) Test config templates"
       env:
         scenario: default
@@ -12,22 +21,13 @@ jobs:
     - name: "(CentOS) Test config templates"
       env:
         scenario: default_centos
-    - name: "(Debian/Ubuntu) Install Modules"
-      env:
-        scenario: module
-    - name: "(Alpine) Install Modules"
-      env:
-        scenario: module_alpine
-    - name: "(CentOS) Install Modules"
-      env:
-        scenario: module_centos
-    - name: "(Debian/Ubuntu) Install Stable Branch and Push Configuration"
+    - name: "(Debian/Ubuntu) Install stable branch and push a config"
       env:
         scenario: stable_push
-    - name: "(Alpine) Install Stable Branch and Push Configuration"
+    - name: "(Alpine) Install stable branch and push a config"
       env:
         scenario: stable_push_alpine
-    - name: "(CentOS) Install Stable Branch and Push Configuration"
+    - name: "(CentOS) Install stable branch and push a config"
       env:
         scenario: stable_push_centos
 before_install:

CHANGELOG.md

@@ -10,6 +10,11 @@ BREAKING CHANGES:
 
 Make sure you only use one variable or the other, since they will overwrite each other. This change will simplify adding future supported modules to this role, and allows you to include any external modules you may wish in your NGINX config.
 
+FEATURES:
+
+*   Add Alpine 3.12 to the list of supported platforms
+*   Remove Alpine 3.8 from the list of supported platforms 
+
 ENHANCEMENTS:
 
 *   Update Ansible to `2.9.13` and Ansible Lint to `4.3.4`.

README.md

@@ -32,92 +32,75 @@ Use `git clone https://github.com/nginxinc/ansible-role-nginx-config.git` to pul
 Platforms
 ---------
 
-The NGINX Ansible role supports all platforms supported by [NGINX Open Source](https://nginx.org/en/linux_packages.html#mainline) and s[NGINX Plus](https://www.nginx.com/products/technical-specs/):
+The NGINX Ansible role 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**
 
 ```yaml
 Alpine:
-  versions:
-    - 3.8
-    - 3.9
-    - 3.10
-    - 3.11
+  - 3.9
+  - 3.10
+  - 3.11
+  - 3.12
 CentOS:
-  versions:
-    - 6
-    - 7
-    - 8
+  - 6
+  - 7
+  - 8
 Debian:
-  versions:
-    - stretch
-    - buster
+  - stretch
+  - buster
 FreeBSD:
-  versions:
-    - 11.2+
-    - 12
+  - 11.2+
+  - 12
 RedHat:
-  versions:
-    - 6
-    - 7.4+
-    - 8
+  - 6
+  - 7.4+
+  - 8
 SUSE/SLES:
-  versions:
-    - 12
-    - 15
+  - 12
+  - 15
 Ubuntu:
-  versions:
-    - xenial
-    - bionic
-    - focal
+  - xenial
+  - bionic
+  - focal
 ```
 
 **NGINX Plus**
 
 ```yaml
 Alpine:
-  versions:
-    - 3.8
-    - 3.9
-    - 3.10
-    - 3.11
+  - 3.9
+  - 3.10
+  - 3.11
+  - 3.12
 Amazon Linux:
-  versions:
-    - 2018.03
+  - 2018.03
 Amazon Linux 2:
-  versions:
-    - any
+  - any
 CentOS:
-  versions:
-    - 6.5+
-    - 7.4+
-    - 8
+  - 6.5+
+  - 7.4+
+  - 8
 Debian:
-  versions:
-    - stretch
-    - buster
+  - stretch
+  - buster
 FreeBSD:
-  versions:
-    - 11.2+
-    - 12
+  - 11.2+
+  - 12
 Oracle Linux:
-  versions:
-    - 6.5+
-    - 7.4+
+  - 6.5+
+  - 7.4+
 RedHat:
-  versions:
-    - 6.5+
-    - 7.4+
-    - 8
+  - 6.5+
+  - 7.4+
+  - 8
 SUSE/SLES:
-  versions:
-    - 12
-    - 15
+  - 12
+  - 15
 Ubuntu:
-  versions:
-    - xenial
-    - bionic
-    - focal
+  - xenial
+  - bionic
+  - focal
 ```
 
 Role Variables
@@ -134,8 +117,8 @@ Example Playbooks
 
 Working functional playbook examples can be found in the **`molecule/common`** directory in the following files:
 
--   **[molecule/common/playbooks/default_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/default_converge.yml):** Use the NGINX configuration templating variables to create an NGINX configuration file
--   **[molecule/common/playbooks/module_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/module_converge.yml):** Cleanup NGINX configs and configure NGINX supported modules
+-   **[molecule/common/playbooks/cleanup_module_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/cleanup_module_converge.yml):** Cleanup an NGINX config and configure NGINX supported modules
+-   **[molecule/common/playbooks/default_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/default_converge.yml):** Use the NGINX config templating variables to create an NGINX config
 -   **[molecule/common/playbooks/stable_push_converge.yml](https://github.com/nginxinc/ansible-role-nginx-config/blob/master/molecule/common/playbooks/stable_push_converge.yml):** Install NGINX using the stable branch and push a preexisting config from your system to your NGINX instance
 
 Do note that if you install this repository via Ansible Galaxy, you will have to replace the role variable in the sample playbooks from `ansible-role-nginx-config` to `nginxinc.nginx_config`.

molecule/module/molecule.yml renamed to molecule/cleanup_module/molecule.yml

@@ -49,5 +49,5 @@ provisioner:
   name: ansible
   playbooks:
     prepare: ../common/playbooks/prepare.yml
-    converge: ../common/playbooks/module_converge.yml
-    verify: ../common/playbooks/module_verify.yml
+    converge: ../common/playbooks/cleanup_module_converge.yml
+    verify: ../common/playbooks/cleanup_module_verify.yml

molecule/module_alpine/molecule.yml renamed to molecule/cleanup_module_alpine/molecule.yml

@@ -10,13 +10,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -38,9 +31,16 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks:
     prepare: ../common/playbooks/prepare.yml
-    converge: ../common/playbooks/module_converge.yml
-    verify: ../common/playbooks/module_verify.yml
+    converge: ../common/playbooks/cleanup_module_converge.yml
+    verify: ../common/playbooks/cleanup_module_verify.yml

molecule/module_centos/molecule.yml renamed to molecule/cleanup_module_centos/molecule.yml

@@ -31,5 +31,5 @@ provisioner:
   name: ansible
   playbooks:
     prepare: ../common/playbooks/prepare.yml
-    converge: ../common/playbooks/module_converge.yml
-    verify: ../common/playbooks/module_verify.yml
+    converge: ../common/playbooks/cleanup_module_converge.yml
+    verify: ../common/playbooks/cleanup_module_verify.yml

molecule/common/playbooks/module_converge.yml renamed to molecule/common/playbooks/cleanup_module_converge.yml

@@ -8,6 +8,8 @@
       vars:
         nginx_config_debug_output: true
         nginx_config_selinux: true
+        nginx_config_selinux_tcp_ports:
+          - 80
 
         nginx_config_main_template_enable: true
         nginx_config_main_template:

molecule/common/playbooks/module_verify.yml renamed to molecule/common/playbooks/cleanup_module_verify.yml

@@ -10,13 +10,6 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
-  - name: alpine-3.8
-    image: alpine:3.8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
   - name: alpine-3.9
     image: alpine:3.9
     dockerfile: ../common/Dockerfile.j2
@@ -38,6 +31,13 @@ platforms:
     volumes:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
 provisioner:
   name: ansible
   playbooks: