diff options
| -rw-r--r-- | roles/router/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/tinc/files/tn_int/hosts/firstroot (renamed from roles/router/files/tn_int/hosts/firstroot) | 0 | ||||
| -rw-r--r-- | roles/tinc/files/tn_int/hosts/hetzner (renamed from roles/router/files/tn_int/hosts/hetzner) | 0 | ||||
| -rw-r--r-- | roles/tinc/files/tn_int/hosts/netcup (renamed from roles/router/files/tn_int/hosts/netcup) | 0 | ||||
| -rw-r--r-- | roles/tinc/files/tn_int/hosts/owrt (renamed from roles/router/files/tn_int/hosts/owrt) | 0 | ||||
| -rw-r--r-- | roles/tinc/files/tn_int/hosts/proxtest (renamed from roles/router/files/tn_int/hosts/proxtest) | 0 | ||||
| -rwxr-xr-x | roles/tinc/files/tn_int/tinc-down (renamed from roles/router/files/tn_int/tinc-down) | 0 | ||||
| -rw-r--r-- | roles/tinc/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/tinc/tasks/tinc.yml (renamed from roles/router/tasks/tinc.yml) | 0 | ||||
| -rwxr-xr-x | roles/tinc/templates/tinc-up.j2 (renamed from roles/router/templates/tinc-up.j2) | 0 | ||||
| -rw-r--r-- | roles/tinc/templates/tinc.conf.j2 (renamed from roles/router/templates/tinc.conf.j2) | 0 |
11 files changed, 15 insertions, 7 deletions
diff --git a/roles/router/tasks/main.yml b/roles/router/tasks/main.yml index c319b4a..6ab944f 100644 --- a/roles/router/tasks/main.yml +++ b/roles/router/tasks/main.yml @@ -2,17 +2,10 @@ - name: Install routing software package: name: - - tinc - bird2 - iperf3 - mtr-tiny state: present -- name: Include tinc tasks - import_tasks: tinc.yml - when: - - tinc is defined - - tinc.configure is defined - - tinc.configure - name: Copy munin plugin copy: src: munin_bird @@ -20,3 +13,6 @@ mode: '0750' tags: - munin +- name: Apply tinc rule + import_role: + name: tinc diff --git a/roles/router/files/tn_int/hosts/firstroot b/roles/tinc/files/tn_int/hosts/firstroot index 8ca33fd..8ca33fd 100644 --- a/roles/router/files/tn_int/hosts/firstroot +++ b/roles/tinc/files/tn_int/hosts/firstroot diff --git a/roles/router/files/tn_int/hosts/hetzner b/roles/tinc/files/tn_int/hosts/hetzner index eca7fb1..eca7fb1 100644 --- a/roles/router/files/tn_int/hosts/hetzner +++ b/roles/tinc/files/tn_int/hosts/hetzner diff --git a/roles/router/files/tn_int/hosts/netcup b/roles/tinc/files/tn_int/hosts/netcup index 3816545..3816545 100644 --- a/roles/router/files/tn_int/hosts/netcup +++ b/roles/tinc/files/tn_int/hosts/netcup diff --git a/roles/router/files/tn_int/hosts/owrt b/roles/tinc/files/tn_int/hosts/owrt index d399c27..d399c27 100644 --- a/roles/router/files/tn_int/hosts/owrt +++ b/roles/tinc/files/tn_int/hosts/owrt diff --git a/roles/router/files/tn_int/hosts/proxtest b/roles/tinc/files/tn_int/hosts/proxtest index 3e397fc..3e397fc 100644 --- a/roles/router/files/tn_int/hosts/proxtest +++ b/roles/tinc/files/tn_int/hosts/proxtest diff --git a/roles/router/files/tn_int/tinc-down b/roles/tinc/files/tn_int/tinc-down index 40a7610..40a7610 100755 --- a/roles/router/files/tn_int/tinc-down +++ b/roles/tinc/files/tn_int/tinc-down diff --git a/roles/tinc/tasks/main.yml b/roles/tinc/tasks/main.yml new file mode 100644 index 0000000..4cfc7cd --- /dev/null +++ b/roles/tinc/tasks/main.yml @@ -0,0 +1,12 @@ +--- +- name: Install routing software + package: + name: + - tinc + state: present +- name: Include tinc tasks + import_tasks: tinc.yml + when: + - tinc is defined + - tinc.configure is defined + - tinc.configure diff --git a/roles/router/tasks/tinc.yml b/roles/tinc/tasks/tinc.yml index 2673a59..2673a59 100644 --- a/roles/router/tasks/tinc.yml +++ b/roles/tinc/tasks/tinc.yml diff --git a/roles/router/templates/tinc-up.j2 b/roles/tinc/templates/tinc-up.j2 index 8c26aa9..8c26aa9 100755 --- a/roles/router/templates/tinc-up.j2 +++ b/roles/tinc/templates/tinc-up.j2 diff --git a/roles/router/templates/tinc.conf.j2 b/roles/tinc/templates/tinc.conf.j2 index b7011e1..b7011e1 100644 --- a/roles/router/templates/tinc.conf.j2 +++ b/roles/tinc/templates/tinc.conf.j2 |