From d8c497012c2dd09deddb482599e6c619f57b2b7e Mon Sep 17 00:00:00 2001 From: Markus Katharina Brechtel Date: Mon, 24 Sep 2018 09:20:40 +0000 Subject: [PATCH] kita-pro-vpn --- group_vars/vpn_servers/netif.yml | 8 +++ host_files/kita-pro-vpn/fastd/vpn/peer.conf | 1 + .../root/.local/share/fish/fish_history | 56 +++++++++++++++++-- host_vars/kita-pro-vpn/netif.yml | 22 +++++++- host_vars/tg-srv-0/netif.yml | 17 ++++++ vpn_servers.yml | 3 +- 6 files changed, 100 insertions(+), 7 deletions(-) diff --git a/group_vars/vpn_servers/netif.yml b/group_vars/vpn_servers/netif.yml index 91737c8..79feba9 100644 --- a/group_vars/vpn_servers/netif.yml +++ b/group_vars/vpn_servers/netif.yml @@ -18,3 +18,11 @@ netifs_profile: babeld: redistribute_networks: - tg-net + mesh: + networks: + - kita-pro-service-net + type: virt_bridge + virt_host_netif: mesh + babeld: + redistribute_networks: + - kita-pro-net diff --git a/host_files/kita-pro-vpn/fastd/vpn/peer.conf b/host_files/kita-pro-vpn/fastd/vpn/peer.conf index 712e14a..0921cba 100644 --- a/host_files/kita-pro-vpn/fastd/vpn/peer.conf +++ b/host_files/kita-pro-vpn/fastd/vpn/peer.conf @@ -2,4 +2,5 @@ key "c61a1701cf00cde38efcbd88d7b365f4d18c45290ffda6900677b18dcd3d0287"; remote 172.23.48.2:10060; remote 51.68.177.5:10060; remote [fd47:17e0:993c:30:47:baff:fe21:28f9]:10060; +remote [fd47:17e0:993c:30:47:45ff:fe65:2035]:10060; float yes; diff --git a/host_files/kita-pro-vpn/root/.local/share/fish/fish_history b/host_files/kita-pro-vpn/root/.local/share/fish/fish_history index b44eb6e..51ebf5c 100644 --- a/host_files/kita-pro-vpn/root/.local/share/fish/fish_history +++ b/host_files/kita-pro-vpn/root/.local/share/fish/fish_history @@ -1,7 +1,5 @@ - cmd: top when: 1536587819 -- cmd: cat /dev/urandom - when: 1536587835 - cmd: cat /dev/urandom when: 1536588003 - cmd: cat /dev/urandom | base32 @@ -12,8 +10,6 @@ when: 1536588024 paths: - /dev/urandom -- cmd: ip a - when: 1536588206 - cmd: cat /etc/network/interfaces when: 1536588218 paths: @@ -22,3 +18,55 @@ when: 1536588220 paths: - /etc/network/interfaces.d/virt +- cmd: nano /etc/network/interfaces + when: 1536588487 + paths: + - /etc/network/interfaces +- cmd: nano /etc/network/interfaces.d/virt + when: 1536588490 + paths: + - /etc/network/interfaces.d/virt +- cmd: systemctl status babeld@vpn + when: 1536591535 +- cmd: nano /etc/fastd/vpn/fastd.conf + when: 1536591642 + paths: + - /etc/fastd/vpn/fastd.conf +- cmd: nano /etc/fastd/vpn/peers/kita-stwg-9.conf + when: 1536591654 +- cmd: mv /etc/fastd/vpn/peers/kita-stwg-9.conf /etc/fastd/vpn/peers/kita-stwg-9 + when: 1536591678 + paths: + - /etc/fastd/vpn/peers/kita-stwg-9.conf +- cmd: systemctl restart fastd@vpn + when: 1536591681 +- cmd: systemctl status fastd@vpn + when: 1536591691 +- cmd: tcpdump -h + when: 1537775177 +- cmd: ping fd47:17e0:993c:3f:47:b9ff:fed9:2951 + when: 1537775501 +- cmd: nano /etc/hosts + when: 1537775509 + paths: + - /etc/hosts +- cmd: ifup mesh + when: 1537779973 +- cmd: ip a + when: 1537779975 +- cmd: systemctl status babeld + when: 1537780044 +- cmd: reboot + when: 1537780101 +- cmd: systemctl status babeld.service + when: 1537780115 +- cmd: ip -6 route + when: 1537780118 +- cmd: tcpdump -i enp7s1 + when: 1537780217 +- cmd: ip r + when: 1537780250 +- cmd: ip -6 r + when: 1537780256 +- cmd: tcpdump -i enp7s2 + when: 1537780259 diff --git a/host_vars/kita-pro-vpn/netif.yml b/host_vars/kita-pro-vpn/netif.yml index 1db5028..028ec7f 100644 --- a/host_vars/kita-pro-vpn/netif.yml +++ b/host_vars/kita-pro-vpn/netif.yml @@ -1,7 +1,26 @@ ansible_host: fd47:17e0:993c:30:47:baff:fe21:28f9 netifs: + mesh: + babeld: + redistribute_networks: + - kita-pro-net + device: enp7s2 + eui64: 47:d4ff:fe1c:ac1d + id: 308501326877 + ips: + - ip: fd47:17e0:993c:30:47:d4ff:fe1c:ac1d/64 + type: eui64 + - ip: 172.23.48.2/24 + type: host + ll6: fe80::47:d4ff:fe1c:ac1d + mac: 02:47:d4:1c:ac:1d + networks: + - kita-pro-service-net + type: virt_bridge + virt_host_netif: mesh + virt_pci_id: 1 virt: - device: enp1s3 + device: enp7s1 dns_resolvers: - fd47:17e0:993c:c2::c:1 - fd47:17e0:993c:c2::c:2 @@ -35,6 +54,7 @@ netifs: - 172.23.48.2:10060 - 51.68.177.5:10060 - '[fd47:17e0:993c:30:47:baff:fe21:28f9]:10060' + - '[fd47:17e0:993c:30:47:45ff:fe65:2035]:10060' id: 308382132767 ips: - ip: fd47:17e0:993c:30:47:cdff:fe01:ea1f/64 diff --git a/host_vars/tg-srv-0/netif.yml b/host_vars/tg-srv-0/netif.yml index 52ca959..e8eb8f4 100644 --- a/host_vars/tg-srv-0/netif.yml +++ b/host_vars/tg-srv-0/netif.yml @@ -14,3 +14,20 @@ netifs: networks: - tg-srv-0 type: bridge + mesh: + babeld: + redistribute_networks: + - tg-net + device: mesh + eui64: 47:9ff:fee0:9d4 + id: 305108355540 + ips: + - ip: fd47:17e0:993c:f:47:9ff:fee0:9d4/64 + type: eui64 + - ip: 172.23.15.1/24 + type: host + ll6: fe80::47:9ff:fee0:9d4 + mac: 02:47:09:e0:09:d4 + networks: + - tg-srv-mesh + type: bridge diff --git a/vpn_servers.yml b/vpn_servers.yml index 353cd1b..763065c 100644 --- a/vpn_servers.yml +++ b/vpn_servers.yml @@ -19,8 +19,7 @@ - hosts: vpn_servers remote_user: root roles: - #- role: common - - role: network + - role: common # - hosts: vpn_servers:&staging # remote_user: root