Merge pull request #15 from nginxinc/ubuntu-support

Add support for Ubuntu 18.04 LTS
nginxinc · Sep 6, 2020 · 3bda56c · 3bda56c
2 parents ce88653 + a221c65
commit 3bda56c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -75,6 +75,9 @@ Debian:
     - 9.10
     - 9.11
     - 9.12
+Ubuntu:
+  versions:
+    - 18.04
 ```
 
 Role Variables

diff --git a/defaults/main.yml b/defaults/main.yml
@@ -82,6 +82,8 @@ app_protect_linux_families:
     - 9.10
     - 9.11
     - 9.12
+  Ubuntu:
+    - 18.04
 
 app_protect_security_policy_template_enable: true
 app_protect_security_policy_template:

diff --git a/meta/main.yml b/meta/main.yml
@@ -16,6 +16,9 @@ galaxy_info:
     - name: Debian
       versions:
         - stretch
+    - name: Ubuntu
+      versions:
+        - bionic
 
   galaxy_tags:
     - waf

diff --git a/sample-playbook/nginx-app-protect-playbook.yml b/sample-playbook/nginx-app-protect-playbook.yml
@@ -1,9 +1,9 @@
 ---
 - hosts: wafs
-  remote_user: centos  
+  remote_user: centos
   pre_tasks:
   - name: load the vars
-    include_vars: 
+    include_vars:
       file: "{{playbook_dir}}/nginx-app-protect-vars.yml"
   roles:
-    - nginxinc.nginx_app_protect          
+    - nginxinc.nginx_app_protect
diff --git a/tasks/prerequisites/install-prerequisites.yml b/tasks/prerequisites/install-prerequisites.yml
@@ -4,9 +4,9 @@
     msg: "ansible_distribution {{ ansible_distribution }}"
     verbosity: 2
 
-- name: "(Setup: Debian) Install Prerequisites"
+- name: "(Setup: Debian/Ubuntu) Install Prerequisites"
   import_tasks: setup-debian.yml
-  when: ansible_distribution == "Debian"
+  when: ansible_distribution == "Debian" or ansible_distribution == "Ubuntu"
 
 - name: "(Setup: CentOS) Install Prerequisites"
   import_tasks: setup-centos.yml

diff --git a/tasks/prerequisites/setup-debian.yml b/tasks/prerequisites/setup-debian.yml
@@ -1,5 +1,5 @@
 ---
-- name: "(Install: Debian) Install Required Debian Dependencies"
+- name: "(Setup: Debian/Ubuntu) Install Required Debian and Ubuntu Dependencies"
   package:
-    name: apt-transport-https, lsb-release, ca-certificates
+    name: apt-transport-https, lsb-release, ca-certificates, wget
     state: present
diff --git a/tasks/setup-debian-repos.yml b/tasks/setup-debian-repos.yml
@@ -1,12 +1,12 @@
 ---
-- name: "(Setup: Debian) Setup NGINX App Protect Repository"
+- name: "(Setup: Debian/Ubuntu) Setup NGINX App Protect Repository"
   apt_repository:
     repo: deb [arch=amd64] https://plus-pkgs.nginx.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus
     filename: nginx-plus
     update_cache: false
     state: "{{ nginx_license_status | default ('present') }}"
 
-- name: "(Setup: Debian) Setup NGINX App Protect Signatures Repository"
+- name: "(Setup: Debian/Ubuntu) Setup NGINX App Protect Signatures Repository"
   apt_repository:
     repo: deb [arch=amd64] https://app-protect-sigs.nginx.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} nginx-plus
     filename: app-protect-sigs
@@ -35,6 +35,6 @@
       Acquire::https::app-protect-sigs.nginx.com::SslKey      "/etc/ssl/nginx/{{ nginx_license.key | basename }}";
     state: "{{ nginx_license_status | default ('present') }}"
 
-- name: "(Setup: Debian) Update APT Cache"
+- name: "(Setup: Debian/Ubuntu) Update APT Cache"
   apt:
     update_cache: true
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,6 +75,9 @@ Debian: @@
         - 9.10
         - 9.11
         - 9.12
+    Ubuntu:
+      versions:
+        - 18.04
     ```
     Role Variables
@@ Expand Down @@