From b53a8cf2283b2d6debb94cd399a72d25da0d7c82 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@niyawe.de>
Date: Sun, 12 Dec 2021 15:15:03 +0100
Subject: merge fastd and uplink nodes

---
 setup_fastd.yml | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

(limited to 'setup_fastd.yml')

diff --git a/setup_fastd.yml b/setup_fastd.yml
index 8429e56..e55f267 100644
--- a/setup_fastd.yml
+++ b/setup_fastd.yml
@@ -7,7 +7,6 @@
       - configure_sysctl
       - configure_iptables
       - configure_static_routes
-      #- install_ssmtp
       - install_cronie
       - install_php
       - install_nginx
@@ -21,39 +20,11 @@
       - install_wireguard_mesh
       - install_wireguard_backbone
       - install_babeld
-      - install_wgkex
+      - install_wg_add
       - install_fastd
       - install_mesh-announce
       - install_monitoring
       - install_iperf3
       - update_ssh_keys
       - install_admin_packages
-- name: basic uplink config
-  hosts: uplink
-  user: root
-  roles:
-      - configure_journald
-      - configure_sysctl
-      - configure_iptables
-      - configure_static_routes
-      - install_cronie
-      #- install_nginx
-      - install_ntp
-      - install_haveged
-      - install_wireguard
-      - install_wireguard_backbone
-      - install_babeld
-      - install_monitoring
-      - install_iperf3
-      - update_ssh_keys
-      - install_admin_packages
-- name: install openvpn uplink
-  hosts: mullvad_uplink
-  user: root
-  roles:
-      - install_openvpn
-- name: setup ffrl
-  hosts: ffrl_uplink
-  user: root
-  roles:
       - setup_ffrl_tunnel
-- 
cgit v1.2.3-54-g00ecf