From b9240ef96572bd34c9355316afbaa4dd740337c1 Mon Sep 17 00:00:00 2001
From: Jean-Marie Mineau <jean-marie.mineau@protonmail.com>
Date: Sat, 10 Jul 2021 03:38:36 +0200
Subject: [PATCH] clean some stuff

---
 books/base.yml                   | 2 +-
 books/vpn.yml                    | 2 +-
 host_vars/azerty/networking.yml  | 3 +--
 host_vars/hindley/networking.yml | 1 +
 host_vars/rossum/networking.yml  | 2 +-
 hosts                            | 1 +
 roles/vpn/tasks/main.yml         | 5 ++---
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/books/base.yml b/books/base.yml
index 46e4e87..fc123c3 100644
--- a/books/base.yml
+++ b/books/base.yml
@@ -5,7 +5,7 @@
     - vpn
     - client_apt_proxy
 
-- hosts: all, tests,
+- hosts: all, !tests,
   roles:
     - networking
     - base_config
diff --git a/books/vpn.yml b/books/vpn.yml
index d653753..841482d 100644
--- a/books/vpn.yml
+++ b/books/vpn.yml
@@ -1,6 +1,6 @@
 #!/usr/bin/env ansible-playbook
 ---
-- hosts: vpn
+- hosts: vpn, !tests
   roles:
     - vpn
     - networking
diff --git a/host_vars/azerty/networking.yml b/host_vars/azerty/networking.yml
index d184921..04d24d7 100644
--- a/host_vars/azerty/networking.yml
+++ b/host_vars/azerty/networking.yml
@@ -4,8 +4,7 @@ interfaces:
     ipv4: 10.50.1.221
     netmaskv4: 16
     type: static
-    routes:
-      - {subnet: 0.0.0.0, netmask: 0, gateway: 10.50.0.254}
+    gateway: 10.50.0.254
   wg0:
     ipv4: "{{ intranet.subnets.physical.subnets.azerty.ipv4 }}"
     netmaskv4: "{{ intranet.netmaskv4 }}"
diff --git a/host_vars/hindley/networking.yml b/host_vars/hindley/networking.yml
index f39efa6..6826896 100644
--- a/host_vars/hindley/networking.yml
+++ b/host_vars/hindley/networking.yml
@@ -1,6 +1,7 @@
 ---
 interfaces:
   enp2s0:
+    ipv4: 45.66.110.3
     type: dhcp
   wg0:
     ipv4: "{{ intranet.subnets.physical.subnets.hindley.ipv4 }}"
diff --git a/host_vars/rossum/networking.yml b/host_vars/rossum/networking.yml
index 0aa717a..6bcc4ed 100644
--- a/host_vars/rossum/networking.yml
+++ b/host_vars/rossum/networking.yml
@@ -4,7 +4,7 @@ interfaces:
     ipv4: 192.168.0.50
     netmaskv4: 24
     type: static
-    gateway: 10.0.2.1
+    gateway: 192.168.0.1
   wg0:
     ipv4: "{{ intranet.subnets.physical.subnets.rossum.ipv4 }}"
     netmaskv4: "{{ intranet.netmaskv4 }}"
diff --git a/hosts b/hosts
index df63455..59d4220 100644
--- a/hosts
+++ b/hosts
@@ -38,6 +38,7 @@ all:
         vm3:
         vm4:
         vm5:
+        rossum:
     vpn:
       hosts:
         azerty:
diff --git a/roles/vpn/tasks/main.yml b/roles/vpn/tasks/main.yml
index 3a9cf44..30c947b 100644
--- a/roles/vpn/tasks/main.yml
+++ b/roles/vpn/tasks/main.yml
@@ -21,7 +21,6 @@
   apt:
     name:
       - wireguard
-      - ifupdown2
     state: latest
     update_cache: true
   register: apt_result
@@ -37,7 +36,7 @@
     mode: '600'
   notify: Restart wireguard for interface
   loop:
-    - "{{ lookup('dict', vpn_interfaces, wantlist=True) }}"
+    - "{{ lookup('dict', vpn_interfaces) }}"
   no_log: true
 
 - name: Enable interface
@@ -46,5 +45,5 @@
     state: started
     enabled: yes
   loop:
-    - "{{ lookup('dict', vpn_interfaces, wantlist=True) }}"
+    - "{{ lookup('dict', vpn_interfaces) }}"
   no_log: true