diff --git a/roles/tinc/defaults/main.yml b/roles/tinc/defaults/main.yml index e02a774..a9a9f3f 100644 --- a/roles/tinc/defaults/main.yml +++ b/roles/tinc/defaults/main.yml @@ -2,7 +2,7 @@ api_floating_ip: 192.168.66.253 netname: meshvpn scw_private_domain: priv.cloud.scaleway.com -tinc_primary_router: proxy0 +tinc_primary_router: proxy1 tinc_route_default_ip: 192.168.66.1 tinc_route_get_ip: 169.254.42.42 vpn_interface: tun0 diff --git a/roles/tinc/tasks/main.yml b/roles/tinc/tasks/main.yml index 33e1fa9..ae39a64 100644 --- a/roles/tinc/tasks/main.yml +++ b/roles/tinc/tasks/main.yml @@ -10,13 +10,6 @@ recurse: True state: directory -- name: create /etc/tinc/nets.boot file from template - template: - src: nets.boot.j2 - dest: /etc/tinc/nets.boot - notify: - - restart tinc - - name: ensure tinc.conf contains connection to all other nodes template: src: tinc.conf.j2 @@ -124,7 +117,7 @@ - name: start tinc on boot systemd: - name: tinc + name: "tinc@{{netname}}" enabled: yes state: started diff --git a/roles/tinc/templates/nets.boot.j2 b/roles/tinc/templates/nets.boot.j2 deleted file mode 100644 index bba075b..0000000 --- a/roles/tinc/templates/nets.boot.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ netname }}