Merge pull request #41 from nginxinc/(feature)/unit-add-distros

(feature)/unit add distros

Author: alessfg

README.md

@@ -19,12 +19,12 @@ install_from: nginx_repository
 # Defaults are the official NGINX repositories.
 nginx_repository:
   debian:
-    - deb https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/','') }}{{ ansible_distribution|lower }}/ {{ ansible_distribution_release }} nginx
-    - deb-src https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/','') }}{{ ansible_distribution|lower }}/ {{ ansible_distribution_release }} nginx
+    - deb https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_distribution|lower }}/ {{ ansible_distribution_release }} nginx
+    - deb-src https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/', '') }}{{ ansible_distribution|lower }}/ {{ ansible_distribution_release }} nginx
   redhat:
-    - https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/','') }}{{ (ansible_distribution == "RedHat") | ternary('rhel/', 'centos/') }}{{ ansible_distribution_major_version|int }}/$basearch/
+    - https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/', '') }}{{ (ansible_distribution == "RedHat") | ternary('rhel/', 'centos/') }}{{ ansible_distribution_major_version|int }}/$basearch/
   suse:
-    - https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/','') }}sles/12
+    - https://nginx.org/packages/{{ (branch == 'mainline') | ternary('mainline/', '') }}sles/12
 
 # Specify which branch of NGINX Open Source you want to install.
 # Options are 'mainline' or 'stable'.

defaults/main.yml

@@ -1,17 +1,20 @@
 ---
-# Start NGINX
 - name: "(Handler: All OSs) Start NGINX"
   service:
     name: nginx
     state: started
 
-# Reload NGINX
 - name: "(Handler: All OSs) Reload NGINX"
   service:
     name: nginx
     state: reloaded
 
-- name: "(Handler: All OSs) Start NGINX Unit"
+- name: "(Handler: Debian/Ubuntu/CentOS/RedHat) Start NGINX Unit"
   service:
     name: unit
     state: started
+
+- name: "(Handler: FreeBSD) Start NGINX Unit"
+  service:
+    name: unitd
+    state: started

handlers/main.yml

@@ -1,7 +1,8 @@
+---
 galaxy_info:
   author: Alessandro Fael Garcia
   description: Official Ansible role for NGINX
-  company: NGINX Inc
+  company: NGINX, Inc.
 
   license: Apache License, Version 2.0
 
@@ -10,22 +11,25 @@ galaxy_info:
   platforms:
   - name: Debian
     versions:
-      - wheezy
       - jessie
       - stretch
   - name: Ubuntu
     versions:
-      - precise
       - trusty
       - xenial
-      - yakkety
+      - artful
+      - bionic
   - name: EL
     versions:
       - 6
       - 7
   - name: SLES
     versions:
       - 12
+  - name: FreeBSD
+    versions:
+      - 10
+      - 11
 
   galaxy_tags:
     - nginx

meta/main.yml

@@ -1,7 +1,16 @@
 ---
-- name: "(Install: All OSs) Install NGINX Unit Modules"
+- name: "(Install: Debian/Ubuntu/CentOS/RedHat) Install NGINX Unit Modules"
   package:
     name: "{{ item }}"
     state: present
   with_items: "{{ unit_modules }}"
-  notify: "(Handler: All OSs) Start NGINX Unit"
+  when: ansible_os_family != "FreeBSD"
+  notify: "(Handler: Debian/Ubuntu/CentOS/RedHat) Start NGINX Unit"
+
+- name: "(Install: FreeBSD) Install NGINX Unit Modules"
+  portinstall:
+    name: "{{ item }}"
+    state: present
+  with_items: "{{ unit_modules }}"
+  when: ansible_os_family == "FreeBSD"
+  notify: "(Handler: FreeBSD) Start NGINX Unit"

tasks/unit/install-modules.yml

@@ -5,11 +5,22 @@
 - import_tasks: setup-redhat.yml
   when: ansible_os_family == "RedHat"
 
-- name: "(Install: All OSs) Install NGINX Unit"
+- import_tasks: setup-freebsd.yml
+  when: ansible_os_family == "FreeBSD"
+
+- name: "(Install: Debian/Ubuntu/CentOS/RedHat) Install NGINX Unit"
   package:
     name: unit
     state: present
-  notify: "(Handler: All OSs) Start NGINX Unit"
+  when: ansible_os_family != "FreeBSD"
+  notify: "(Handler: Debian/Ubuntu/CentOS/RedHat) Start NGINX Unit"
+
+- name: "(Install: FreeBSD) Install NGINX Unit"
+  portinstall:
+    name: unit
+    state: present
+  when: ansible_os_family == "FreeBSD"
+  notify: "(Handler: FreeBSD) Start NGINX Unit"
 
 - import_tasks: install-modules.yml
   when: unit_modules is defined and unit_modules

tasks/unit/install-unit.yml

@@ -0,0 +1,10 @@
+---
+- name: "(Install: FreeBSD) Fetch Ports"
+  command: portsnap fetch --interactive
+  args:
+    creates: /var/db/portsnap/INDEX
+
+- name: "(Install: FreeBSD) Extract Ports"
+  command: portsnap extract
+  args:
+    creates: /usr/ports

tasks/unit/setup-freebsd.yml

@@ -11,7 +11,7 @@
 - name: "(Install: Amazon Linux) Add NGINX Unit Repository"
   yum_repository:
     name: unit
-    baseurl: https://packages.nginx.org/unit/amzn/$releasever/$basearch/
+    baseurl: https://packages.nginx.org/unit/amzn{{ (ansible_distribution_version == "2") | ternary('2', '') }}/$releasever/$basearch/
     description: NGINX Unit Repository
     enabled: yes
     gpgcheck: yes