From 5ab3e67331be6121a46bbce6ab15c25396eefe41 Mon Sep 17 00:00:00 2001 From: Barry flanagan Date: Mon, 29 Jan 2018 15:11:08 +0000 Subject: [PATCH] Add support for Debian distros --- tasks/install.yml | 23 ++++++++++++++++++++++- tasks/join_network.yml | 4 ++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/tasks/install.yml b/tasks/install.yml index 3249a31..5e2b1f7 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -1,4 +1,6 @@ --- + + # Redhat variants - block: # Add zerotier repo and it's gpg key - name: Add zerotier gpg key rpm_key: @@ -13,10 +15,29 @@ gpgcheck: yes enabled: yes register: zerotier_repo - tags: - installation - repositories + when: ansible_os_family == "RedHat" + + # Debian variants +- block: # Add zerotier repo and it's gpg key if not already done. + - name: Check if zerotier is already installed + package: + name: zerotier-one + state: present + check_mode: true + register: zerotier_repo + + - name: Install zerotier + shell: curl -s 'https://pgp.mit.edu/pks/lookup?op=get&search=0x1657198823E52A61' | gpg --import && \ + if z=$(curl -s 'https://install.zerotier.com/' | gpg); then echo "$z" | sudo bash; fi + register: zerotier_repo + when: zerotier_repo.changed + tags: + - installation + - repositories + when: ansible_os_family == "Debian" - block: #Install and enable zerotier-one - name: Install zerotier-one diff --git a/tasks/join_network.yml b/tasks/join_network.yml index 26e0213..0fe71dd 100644 --- a/tasks/join_network.yml +++ b/tasks/join_network.yml @@ -1,7 +1,7 @@ --- - block: # Join Zerotier network - name: Get Zerotier NodeID - shell: /sbin/zerotier-cli info | awk '{print $3}' + shell: zerotier-cli info | awk '{print $3}' register: nodeid - name: Set NodeID as fact @@ -23,7 +23,7 @@ register: apiresult - name: Join Zerotier network - command: /sbin/zerotier-cli join {{ zerotier_network_id }} + command: zerotier-cli join {{ zerotier_network_id }} args: creates: /var/lib/zerotier-one/networks.d/{{ zerotier_network_id }}.conf