From 9454fdbff511e965e4fd9eb187b7fe432dcd437e Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@labitat.dk>
Date: Wed, 26 Sep 2018 13:16:11 +0200
Subject: space_server: drop uneccessary subdirs

---
 roles/space_server/tasks/avahi.yml     | 2 +-
 roles/space_server/tasks/blackhole.yml | 4 ++--
 roles/space_server/tasks/dhcpd.yml     | 2 +-
 roles/space_server/tasks/networkd.yml  | 4 ++--
 roles/space_server/tasks/nftables.yml  | 4 ++--
 roles/space_server/tasks/radvd.yml     | 2 +-
 roles/space_server/tasks/sudo.yml      | 2 +-
 roles/space_server/tasks/unbound.yml   | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'roles/space_server/tasks')

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
-- 
cgit v1.2.1