From 4547d44907029530b9d2b56f609e562daf99848c Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 4 Aug 2019 22:53:44 +0200 Subject: wireguard: Removing hesland and edipost networks. --- ansible/ansible.cfg | 2 +- ansible/group_vars/all/wireguard_wg-edipost.yml | 17 ------------- ansible/group_vars/all/wireguard_wg-hesland.yml | 11 --------- ansible/group_vars/all/wireguard_wg-net1.yml | 32 ------------------------- ansible/group_vars/all/wireguard_wg_edipost.yml | 19 +++++++++++++++ ansible/group_vars/all/wireguard_wg_hesland.yml | 11 +++++++++ ansible/group_vars/all/wireguard_wg_net1.yml | 32 +++++++++++++++++++++++++ ansible/wireguard.yml | 13 +++++----- 8 files changed, 70 insertions(+), 67 deletions(-) delete mode 100644 ansible/group_vars/all/wireguard_wg-edipost.yml delete mode 100644 ansible/group_vars/all/wireguard_wg-hesland.yml delete mode 100644 ansible/group_vars/all/wireguard_wg-net1.yml create mode 100644 ansible/group_vars/all/wireguard_wg_edipost.yml create mode 100644 ansible/group_vars/all/wireguard_wg_hesland.yml create mode 100644 ansible/group_vars/all/wireguard_wg_net1.yml diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg index 5f7f40b..06682af 100644 --- a/ansible/ansible.cfg +++ b/ansible/ansible.cfg @@ -9,4 +9,4 @@ roles_path = roles:thirdparty retry_files_enabled = False strategy_plugins = env/lib/python3.7/site-packages/ansible_mitogen/plugins/strategy -strategy = mitogen_linear +#strategy = mitogen_linear diff --git a/ansible/group_vars/all/wireguard_wg-edipost.yml b/ansible/group_vars/all/wireguard_wg-edipost.yml deleted file mode 100644 index 72e4977..0000000 --- a/ansible/group_vars/all/wireguard_wg-edipost.yml +++ /dev/null @@ -1,17 +0,0 @@ -wireguard-wg-edipost: - if: wg-edipost - ipv4_prefix: 24 - shared_routes: - - gateway: 192.168.200.136 - net: 192.168.100.0 - prefix: 24 - - hosts: - conflatorio: - state: present - ipv4: 192.168.200.138 - edipost-wg: - public_key: VWEMk20CI5RJohjnar4HicuaZbj3d1aoewvQNorWITs= - endpoint: 77.106.183.85 - listen_port: 51820 - peers: all diff --git a/ansible/group_vars/all/wireguard_wg-hesland.yml b/ansible/group_vars/all/wireguard_wg-hesland.yml deleted file mode 100644 index 6755799..0000000 --- a/ansible/group_vars/all/wireguard_wg-hesland.yml +++ /dev/null @@ -1,11 +0,0 @@ -wireguard-wg-hesland: - if: wg-hesland - ipv4_prefix: 24 - hosts: - webgateway: - endpoint: hesland.trygvis.io - listen_port: 55139 - conflatorio: - ipv4: 10.0.212.2 - arius: - ipv4: 10.0.212.4 diff --git a/ansible/group_vars/all/wireguard_wg-net1.yml b/ansible/group_vars/all/wireguard_wg-net1.yml deleted file mode 100644 index 33044ab..0000000 --- a/ansible/group_vars/all/wireguard_wg-net1.yml +++ /dev/null @@ -1,32 +0,0 @@ -wireguard-wg-net1: - if: wg-net1 - ipv4_prefix: 24 - ipv6_prefix: 64 - hosts: - knot: - endpoint: trygvis.io - listen_port: 51820 - ipv4: 192.168.80.1 - # Generated by https://www.ultratools.com/tools/rangeGenerator - ipv6: fdf3:aad9:a885:0b3a::1 - peers: all - birgitte: - state: present - ipv4: 192.168.80.2 - ipv6: fdf3:aad9:a885:0b3a::2 - conflatorio: - state: present - ipv4: 192.168.80.3 - ipv6: fdf3:aad9:a885:0b3a::3 - fuckaduck: - state: absent - ipv4: 192.168.80.4 - ipv6: fdf3:aad9:a885:0b3a::4 - arius: - state: present - ipv4: 192.168.80.6 - ipv6: fdf3:aad9:a885:0b3a::6 - akili: - state: present - ipv4: 192.168.80.7 - ipv6: fdf3:aad9:a885:0b3a::7 diff --git a/ansible/group_vars/all/wireguard_wg_edipost.yml b/ansible/group_vars/all/wireguard_wg_edipost.yml new file mode 100644 index 0000000..3511ab5 --- /dev/null +++ b/ansible/group_vars/all/wireguard_wg_edipost.yml @@ -0,0 +1,19 @@ +wireguard_wg_edipost: + if: wg-edipost + ipv4_prefix: 24 + shared_routes: + - gateway: 192.168.200.136 + net: 192.168.100.0 + prefix: 24 + + hosts: + conflatorio: + state: present + ipv4: 192.168.200.138 + arius: + ipv4: 192.168.200.150 + edipost-wg: + public_key: VWEMk20CI5RJohjnar4HicuaZbj3d1aoewvQNorWITs= + endpoint: 77.106.183.85 + listen_port: 51820 + peers: all diff --git a/ansible/group_vars/all/wireguard_wg_hesland.yml b/ansible/group_vars/all/wireguard_wg_hesland.yml new file mode 100644 index 0000000..f9de778 --- /dev/null +++ b/ansible/group_vars/all/wireguard_wg_hesland.yml @@ -0,0 +1,11 @@ +wireguard_wg_hesland: + if: wg-hesland + ipv4_prefix: 24 + hosts: + webgateway: + endpoint: hesland.trygvis.io + listen_port: 55139 + conflatorio: + ipv4: 10.0.212.2 + arius: + ipv4: 10.0.212.4 diff --git a/ansible/group_vars/all/wireguard_wg_net1.yml b/ansible/group_vars/all/wireguard_wg_net1.yml new file mode 100644 index 0000000..bc2c39e --- /dev/null +++ b/ansible/group_vars/all/wireguard_wg_net1.yml @@ -0,0 +1,32 @@ +wireguard_wg_net1: + if: wg-net1 + ipv4_prefix: 24 + ipv6_prefix: 64 + hosts: + knot: + endpoint: trygvis.io + listen_port: 51820 + ipv4: 192.168.80.1 + # Generated by https://www.ultratools.com/tools/rangeGenerator + ipv6: fdf3:aad9:a885:0b3a::1 + peers: all + birgitte: + state: present + ipv4: 192.168.80.2 + ipv6: fdf3:aad9:a885:0b3a::2 + conflatorio: + state: present + ipv4: 192.168.80.3 + ipv6: fdf3:aad9:a885:0b3a::3 + fuckaduck: + state: absent + ipv4: 192.168.80.4 + ipv6: fdf3:aad9:a885:0b3a::4 + arius: + state: present + ipv4: 192.168.80.6 + ipv6: fdf3:aad9:a885:0b3a::6 + akili: + state: present + ipv4: 192.168.80.7 + ipv6: fdf3:aad9:a885:0b3a::7 diff --git a/ansible/wireguard.yml b/ansible/wireguard.yml index 9d0151a..26ee9ff 100644 --- a/ansible/wireguard.yml +++ b/ansible/wireguard.yml @@ -1,12 +1,12 @@ - hosts: - - wireguard_wg-net1 + - wireguard_wg_net1 tags: - never - wg-net1 roles: - role: wireguard wireguard__state: absent - wireguard__name: wireguard-wg-net1 + wireguard__name: wireguard_wg_net1 - hosts: - wireguard_wg0 @@ -27,17 +27,18 @@ - hosts: - wireguard_hesland - tags: wg-hesland + tags: wg_hesland roles: - role: wireguard - wireguard__name: wireguard-wg-hesland + wireguard__name: wireguard_wg_hesland wireguard__state: absent - hosts: - wireguard_edipost - tags: wg-edipost + tags: wg_edipost roles: - role: wireguard - wireguard__name: wireguard-wg-edipost + wireguard__name: wireguard_wg_edipost + wireguard__state: absent vars: wg_net: "{{ hostvars[ansible_hostname][wireguard__name] }}" -- cgit v1.2.3