Skip to content

Commit

Permalink
Merge pull request #10 from flantel/master
Browse files Browse the repository at this point in the history
Add support for Debian distros
  • Loading branch information
m4rcu5nl committed Jan 29, 2018
2 parents 62682de + 5ab3e67 commit 3b0cdf7
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
21 changes: 21 additions & 0 deletions tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---

# Redhat variants
- block: # Add zerotier repo and it's gpg key
- name: Add zerotier gpg key
rpm_key:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tasks/join_network.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down

0 comments on commit 3b0cdf7

Please sign in to comment.