39 files changed, 11 insertions, 11 deletions
diff --git a/roles/space_server/files/blackhole/blackhole.service b/roles/space_server/files/blackhole.service
index e32f642..e32f642 100644
--- a/roles/space_server/files/blackhole/blackhole.service
+++ b/roles/space_server/files/blackhole.service
diff --git a/roles/space_server/files/blackhole/blackhole.sh b/roles/space_server/files/blackhole.sh
index 56a6c10..56a6c10 100755
--- a/roles/space_server/files/blackhole/blackhole.sh
+++ b/roles/space_server/files/blackhole.sh
diff --git a/roles/space_server/files/networkd/network/10-lan.link b/roles/space_server/files/network/10-lan.link
index 996917e..996917e 100644
--- a/roles/space_server/files/networkd/network/10-lan.link
+++ b/roles/space_server/files/network/10-lan.link
diff --git a/roles/space_server/files/networkd/network/10-lan.network b/roles/space_server/files/network/10-lan.network
index 08b85aa..08b85aa 100644
--- a/roles/space_server/files/networkd/network/10-lan.network
+++ b/roles/space_server/files/network/10-lan.network
diff --git a/roles/space_server/files/networkd/network/10-lan10.netdev b/roles/space_server/files/network/10-lan10.netdev
index 655859d..655859d 100644
--- a/roles/space_server/files/networkd/network/10-lan10.netdev
+++ b/roles/space_server/files/network/10-lan10.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan10.network b/roles/space_server/files/network/10-lan10.network
index 18931e0..18931e0 100644
--- a/roles/space_server/files/networkd/network/10-lan10.network
+++ b/roles/space_server/files/network/10-lan10.network
diff --git a/roles/space_server/files/networkd/network/10-lan11.netdev b/roles/space_server/files/network/10-lan11.netdev
index b99b50b..b99b50b 100644
--- a/roles/space_server/files/networkd/network/10-lan11.netdev
+++ b/roles/space_server/files/network/10-lan11.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan11.network b/roles/space_server/files/network/10-lan11.network
index 88d714f..88d714f 100644
--- a/roles/space_server/files/networkd/network/10-lan11.network
+++ b/roles/space_server/files/network/10-lan11.network
diff --git a/roles/space_server/files/networkd/network/10-lan12.netdev b/roles/space_server/files/network/10-lan12.netdev
index 7229fa1..7229fa1 100644
--- a/roles/space_server/files/networkd/network/10-lan12.netdev
+++ b/roles/space_server/files/network/10-lan12.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan12.network b/roles/space_server/files/network/10-lan12.network
index 7f48f5b..7f48f5b 100644
--- a/roles/space_server/files/networkd/network/10-lan12.network
+++ b/roles/space_server/files/network/10-lan12.network
diff --git a/roles/space_server/files/networkd/network/10-lan13.netdev b/roles/space_server/files/network/10-lan13.netdev
index ab05488..ab05488 100644
--- a/roles/space_server/files/networkd/network/10-lan13.netdev
+++ b/roles/space_server/files/network/10-lan13.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan13.network b/roles/space_server/files/network/10-lan13.network
index 81e3911..81e3911 100644
--- a/roles/space_server/files/networkd/network/10-lan13.network
+++ b/roles/space_server/files/network/10-lan13.network
diff --git a/roles/space_server/files/networkd/network/10-lan14.netdev b/roles/space_server/files/network/10-lan14.netdev
index 1956a88..1956a88 100644
--- a/roles/space_server/files/networkd/network/10-lan14.netdev
+++ b/roles/space_server/files/network/10-lan14.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan14.network b/roles/space_server/files/network/10-lan14.network
index 5b40bbf..5b40bbf 100644
--- a/roles/space_server/files/networkd/network/10-lan14.network
+++ b/roles/space_server/files/network/10-lan14.network
diff --git a/roles/space_server/files/networkd/network/10-lan15.netdev b/roles/space_server/files/network/10-lan15.netdev
index c31a650..c31a650 100644
--- a/roles/space_server/files/networkd/network/10-lan15.netdev
+++ b/roles/space_server/files/network/10-lan15.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan15.network b/roles/space_server/files/network/10-lan15.network
index e3c99dd..e3c99dd 100644
--- a/roles/space_server/files/networkd/network/10-lan15.network
+++ b/roles/space_server/files/network/10-lan15.network
diff --git a/roles/space_server/files/networkd/network/10-lan20.netdev b/roles/space_server/files/network/10-lan20.netdev
index 2b2e0d8..2b2e0d8 100644
--- a/roles/space_server/files/networkd/network/10-lan20.netdev
+++ b/roles/space_server/files/network/10-lan20.netdev
diff --git a/roles/space_server/files/networkd/network/10-lan20.network b/roles/space_server/files/network/10-lan20.network
index 06b1ff1..06b1ff1 100644
--- a/roles/space_server/files/networkd/network/10-lan20.network
+++ b/roles/space_server/files/network/10-lan20.network
diff --git a/roles/space_server/files/networkd/network/10-lo.network b/roles/space_server/files/network/10-lo.network
index 2321ce5..2321ce5 100644
--- a/roles/space_server/files/networkd/network/10-lo.network
+++ b/roles/space_server/files/network/10-lo.network
diff --git a/roles/space_server/files/networkd/network/10-mgt.link b/roles/space_server/files/network/10-mgt.link
index 715f409..715f409 100644
--- a/roles/space_server/files/networkd/network/10-mgt.link
+++ b/roles/space_server/files/network/10-mgt.link
diff --git a/roles/space_server/files/networkd/network/10-mgt.network b/roles/space_server/files/network/10-mgt.network
index 9da626e..9da626e 100644
--- a/roles/space_server/files/networkd/network/10-mgt.network
+++ b/roles/space_server/files/network/10-mgt.network
diff --git a/roles/space_server/files/networkd/network/10-wan.link b/roles/space_server/files/network/10-wan.link
index 47a7270..47a7270 100644
--- a/roles/space_server/files/networkd/network/10-wan.link
+++ b/roles/space_server/files/network/10-wan.link
diff --git a/roles/space_server/files/networkd/network/10-wan.network b/roles/space_server/files/network/10-wan.network
index 1d14dee..1d14dee 100644
--- a/roles/space_server/files/networkd/network/10-wan.network
+++ b/roles/space_server/files/network/10-wan.network
diff --git a/roles/space_server/files/networkd/no-lan-mgt.conf b/roles/space_server/files/networkd-no-lan-mgt.conf
index 3309cf0..3309cf0 100644
--- a/roles/space_server/files/networkd/no-lan-mgt.conf
+++ b/roles/space_server/files/networkd-no-lan-mgt.conf
diff --git a/roles/space_server/files/nftables/nftables.conf b/roles/space_server/files/nftables.conf
index 5f2f1b3..5f2f1b3 100644
--- a/roles/space_server/files/nftables/nftables.conf
+++ b/roles/space_server/files/nftables.conf
diff --git a/roles/space_server/files/nftables/nftables.service b/roles/space_server/files/nftables.service
index f1c9028..f1c9028 100644
--- a/roles/space_server/files/nftables/nftables.service
+++ b/roles/space_server/files/nftables.service
diff --git a/roles/space_server/files/radvd/radvd.conf b/roles/space_server/files/radvd.conf
index 9f994a3..9f994a3 100644
--- a/roles/space_server/files/radvd/radvd.conf
+++ b/roles/space_server/files/radvd.conf
diff --git a/roles/space_server/files/sudo/sudoers b/roles/space_server/files/sudoers
index 069052c..069052c 100644
--- a/roles/space_server/files/sudo/sudoers
+++ b/roles/space_server/files/sudoers
diff --git a/roles/space_server/tasks/avahi.yml b/roles/space_server/tasks/avahi.yml
index a725b58..1161863 100644
--- a/roles/space_server/tasks/avahi.yml
+++ b/roles/space_server/tasks/avahi.yml
@@ -77,7 +77,7 @@
 - name: Configure hosts
   template:
     dest: '/etc/avahi/hosts'
-    src: avahi/hosts.j2
+    src: avahi-hosts.j2
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/tasks/blackhole.yml b/roles/space_server/tasks/blackhole.yml
index 7c3b510..cb139f7 100644
--- a/roles/space_server/tasks/blackhole.yml
+++ b/roles/space_server/tasks/blackhole.yml
@@ -9,7 +9,7 @@
 - name: Install blackhole script
   copy:
     dest: '/etc/systemd/scripts/blackhole.sh'
-    src: blackhole/blackhole.sh
+    src: blackhole.sh
     owner: root
     group: root
     mode: 0755
@@ -19,7 +19,7 @@
 - name: Install blackhole service
   copy:
     dest: '/etc/systemd/system/blackhole.service'
-    src: blackhole/blackhole.service
+    src: blackhole.service
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/tasks/dhcpd.yml b/roles/space_server/tasks/dhcpd.yml
index cd09a04..29d5bc5 100644
--- a/roles/space_server/tasks/dhcpd.yml
+++ b/roles/space_server/tasks/dhcpd.yml
@@ -9,7 +9,7 @@
 - name: Configure dhcpd
   template:
     dest: '/etc/dhcp/dhcpd.conf'
-    src: dhcpd/dhcpd.conf.j2
+    src: dhcpd.conf.j2
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/tasks/networkd.yml b/roles/space_server/tasks/networkd.yml
index 318fbb5..6b0ff48 100644
--- a/roles/space_server/tasks/networkd.yml
+++ b/roles/space_server/tasks/networkd.yml
@@ -19,7 +19,7 @@
     owner: root
     group: root
     mode: 0644
-  with_fileglob: 'networkd/network/*'
+  with_fileglob: 'network/*'
   register: networkd_created
 
 - name: Delete unneeded network configuration
@@ -39,7 +39,7 @@
 - name: Don't wait for lan and mgt interfaces to come online
   copy:
     dest: '/etc/systemd/system/systemd-networkd-wait-online.service.d/no-lan-mgt.conf'
-    src: networkd/no-lan-mgt.conf
+    src: networkd-no-lan-mgt.conf
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/tasks/nftables.yml b/roles/space_server/tasks/nftables.yml
index 73e9251..1f56a93 100644
--- a/roles/space_server/tasks/nftables.yml
+++ b/roles/space_server/tasks/nftables.yml
@@ -2,7 +2,7 @@
 - name: Install our nftables service
   copy:
     dest: '/etc/systemd/system/nftables.service'
-    src: nftables/nftables.service
+    src: nftables.service
     owner: root
     group: root
     mode: 0644
@@ -25,7 +25,7 @@
 - name: Configure nftables
   copy:
     dest: '/etc/nftables.conf'
-    src: nftables/nftables.conf
+    src: nftables.conf
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/tasks/radvd.yml b/roles/space_server/tasks/radvd.yml
index a3346eb..1c39213 100644
--- a/roles/space_server/tasks/radvd.yml
+++ b/roles/space_server/tasks/radvd.yml
@@ -9,7 +9,7 @@
 - name: Configure radvd
   copy:
     dest: '/etc/radvd.conf'
-    src: radvd/radvd.conf
+    src: radvd.conf
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/tasks/sudo.yml b/roles/space_server/tasks/sudo.yml
index f5f0444..9db1d55 100644
--- a/roles/space_server/tasks/sudo.yml
+++ b/roles/space_server/tasks/sudo.yml
@@ -9,7 +9,7 @@
 - name: Install sudoers file
   copy:
     dest: '/etc/sudoers'
-    src: sudo/sudoers
+    src: sudoers
     owner: root
     group: root
     mode: 0440
diff --git a/roles/space_server/tasks/unbound.yml b/roles/space_server/tasks/unbound.yml
index c384635..81199b9 100644
--- a/roles/space_server/tasks/unbound.yml
+++ b/roles/space_server/tasks/unbound.yml
@@ -9,7 +9,7 @@
 - name: Configure unbound
   template:
     dest: '/etc/unbound/unbound.conf'
-    src: unbound/unbound.conf.j2
+    src: unbound.conf.j2
     owner: root
     group: root
     mode: 0644
diff --git a/roles/space_server/templates/avahi/hosts.j2 b/roles/space_server/templates/avahi-hosts.j2
index f87ad4b..f87ad4b 100644
--- a/roles/space_server/templates/avahi/hosts.j2
+++ b/roles/space_server/templates/avahi-hosts.j2
diff --git a/roles/space_server/templates/dhcpd/dhcpd.conf.j2 b/roles/space_server/templates/dhcpd.conf.j2
index 1b832e1..1b832e1 100644
--- a/roles/space_server/templates/dhcpd/dhcpd.conf.j2
+++ b/roles/space_server/templates/dhcpd.conf.j2
diff --git a/roles/space_server/templates/unbound/unbound.conf.j2 b/roles/space_server/templates/unbound.conf.j2
index d09d7af..d09d7af 100644
--- a/roles/space_server/templates/unbound/unbound.conf.j2
+++ b/roles/space_server/templates/unbound.conf.j2