Merge pull request #23 from G10h4ck/auth_delegation

Make authentication delegation configurable
pull/25/head
Marcus 2018-10-15 19:04:18 +02:00 committed by GitHub
commit 6118217734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View File

@ -1,6 +1,7 @@
--- ---
# defaults file for ansible-role-zerotier # defaults file for ansible-role-zerotier
zerotier_api_url: https://my.zerotier.com zerotier_api_url: https://my.zerotier.com
zerotier_api_delegate: localhost
zerotier_apt_state: present zerotier_apt_state: present
zerotier_register_short_hostname: false zerotier_register_short_hostname: false
zerotier_authorize_member: true zerotier_authorize_member: true

View File

@ -10,8 +10,7 @@
zerotier_node_id: "{{ nodeid.stdout }}" zerotier_node_id: "{{ nodeid.stdout }}"
- name: Authorize members to network - name: Authorize members to network
local_action: uri:
module: uri
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ zerotier_node_id }}" url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ zerotier_node_id }}"
method: POST method: POST
headers: headers:
@ -23,10 +22,10 @@
body_format: json body_format: json
register: auth_apiresult register: auth_apiresult
become: false become: false
delegate_to: "{{ zerotier_api_delegate }}"
- name: Configure members in network - name: Configure members in network
local_action: uri:
module: uri
url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ zerotier_node_id }}" url: "{{ zerotier_api_url }}/api/network/{{ zerotier_network_id }}/member/{{ zerotier_node_id }}"
method: POST method: POST
headers: headers:
@ -39,6 +38,7 @@
body_format: json body_format: json
register: conf_apiresult register: conf_apiresult
become: false become: false
delegate_to: "{{ zerotier_api_delegate }}"
when: when:
- zerotier_accesstoken is defined - zerotier_accesstoken is defined