From dcc0291ddbe793687a0e0b33300c164dcbb1d080 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Thu, 20 Aug 2020 01:11:33 -0400
Subject: [PATCH] unarchive not working on fbsd

---
 ansible/ansible.cfg                           |  8 ++++---
 ansible/{inventory/hosts => inventory.txt}    |  0
 ansible/playbooks/site.yml                    |  4 ----
 ansible/requirements.txt                      |  8 +++++++
 ansible/roles/common/tasks/Debian.yml         |  8 +++----
 ansible/roles/common/tasks/FreeBSD.yml        |  1 +
 ansible/roles/common/tasks/main.yml           |  2 +-
 ansible/roles/consul_server/tasks/Debian.yml  | 12 ++++++++++
 ansible/roles/consul_server/tasks/FreeBSD.yml | 24 ++++++++++++++++++-
 ansible/roles/consul_server/tasks/main.yml    |  2 +-
 10 files changed, 55 insertions(+), 14 deletions(-)
 rename ansible/{inventory/hosts => inventory.txt} (100%)
 create mode 100644 ansible/requirements.txt

diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index 3907441..872978e 100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -1,16 +1,18 @@
 # config file for ansible -- Asara
 # ===============================================
 [defaults]
-
-inventory               = inventory/hosts
+inventory               = inventory.txt
 remote_tmp              = ~/.ansible/tmp
 local_tmp               = ~/.ansible/tmp
+group_vars              = ./group_vars
+roles_path              = ./roles
+interpreter_python      = python3
+
 forks                   = 5
 poll_interval           = 15
 transport               = smart
 remote_port             = 22
 gathering               = smart
-roles_path              = ./roles
 stdout_callback         = skippy
 callback_whitelist      = timer
 timeout                 = 10
diff --git a/ansible/inventory/hosts b/ansible/inventory.txt
similarity index 100%
rename from ansible/inventory/hosts
rename to ansible/inventory.txt
diff --git a/ansible/playbooks/site.yml b/ansible/playbooks/site.yml
index 7237d26..5c3bfdc 100644
--- a/ansible/playbooks/site.yml
+++ b/ansible/playbooks/site.yml
@@ -6,8 +6,4 @@
 - hosts: consul_server
   roles:
     - role: consul_server
-
-- hosts: all:!consul_server
-  roles:
-    - role: consul
 ...
diff --git a/ansible/requirements.txt b/ansible/requirements.txt
new file mode 100644
index 0000000..79f45a7
--- /dev/null
+++ b/ansible/requirements.txt
@@ -0,0 +1,8 @@
+ansible==2.9.12
+cffi==1.14.2
+cryptography==3.0
+Jinja2==2.11.2
+MarkupSafe==1.1.1
+pycparser==2.20
+PyYAML==5.3.1
+six==1.15.0
diff --git a/ansible/roles/common/tasks/Debian.yml b/ansible/roles/common/tasks/Debian.yml
index c1b82d7..1ddd499 100644
--- a/ansible/roles/common/tasks/Debian.yml
+++ b/ansible/roles/common/tasks/Debian.yml
@@ -1,11 +1,11 @@
 ---
 - name: apt update
   apt:
-    update_cache: true
+    update_cache: True
 
 - name: apt upgrade
   apt:
-    upgrade: yes
+    upgrade: "yes"
 
 - name: apt dist-upgrade
   apt:
@@ -27,9 +27,9 @@
       - tmux
       - tree
       - vim
-    state: installed
+    state: present
 
 - name: apt autoremove
   apt:
-    autoremove: true
+    autoremove: True
 ...
diff --git a/ansible/roles/common/tasks/FreeBSD.yml b/ansible/roles/common/tasks/FreeBSD.yml
index e619cb4..0168291 100644
--- a/ansible/roles/common/tasks/FreeBSD.yml
+++ b/ansible/roles/common/tasks/FreeBSD.yml
@@ -6,6 +6,7 @@
     packages:
       - htop
       - git
+      - gtar
       - ncdu
       - ntp
       - screen
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index 4c4765f..8ebc556 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
-- include: "{{ ansible_os_family }}"
+- include: "{{ ansible_os_family }}.yml"
 ...
diff --git a/ansible/roles/consul_server/tasks/Debian.yml b/ansible/roles/consul_server/tasks/Debian.yml
index ebbac49..42d3804 100644
--- a/ansible/roles/consul_server/tasks/Debian.yml
+++ b/ansible/roles/consul_server/tasks/Debian.yml
@@ -1,6 +1,18 @@
 ---
+- name: check consul version
+  shell:
+    cmd: "consul --version | head -1 | cut -d'v' -f2"
+  args:
+    executable: /bin/bash
+  changed_when: False
+  register: installed_consul_version
+
 - name: get consul
   unarchive:
     src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip"
     dest: /usr/local/bin/
+    mode: 0755
+    owner: root
+    group: root
     remote_src: yes
+  when: installed_consul_version.stdout != consul_version
diff --git a/ansible/roles/consul_server/tasks/FreeBSD.yml b/ansible/roles/consul_server/tasks/FreeBSD.yml
index cf9966b..e657656 100644
--- a/ansible/roles/consul_server/tasks/FreeBSD.yml
+++ b/ansible/roles/consul_server/tasks/FreeBSD.yml
@@ -1,4 +1,26 @@
 ---
+- name: check consul version
+  shell:
+    cmd: "consul --version | head -1 | cut -d'v' -f2"
+  args:
+    executable: /bin/bash
+  changed_when: False
+  failed_when: False
+  register: installed_consul_version
+
+- name: get consul
+  get_url:
+    url: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_freebsd_amd64.zip"
+    dest: /tmp/consul.zip
+  when: ("No such file" not in installed_consul_version.msg) or (installed_consul_version.msg != consul_version)
+  register: get_consul
+
 - name: get consul
   unarchive:
-    src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip"
+    src: /tmp/consul.zip
+    dest: /usr/local/bin/
+    remote_src: True
+    mode: 0755
+    owner: root
+    group: root
+  when: get_consul.changed
diff --git a/ansible/roles/consul_server/tasks/main.yml b/ansible/roles/consul_server/tasks/main.yml
index 4c4765f..8ebc556 100644
--- a/ansible/roles/consul_server/tasks/main.yml
+++ b/ansible/roles/consul_server/tasks/main.yml
@@ -1,3 +1,3 @@
 ---
-- include: "{{ ansible_os_family }}"
+- include: "{{ ansible_os_family }}.yml"
 ...