From 4c8ce84da087dde7ace19704f084738fbd44f0a0 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@labitat.dk>
Date: Thu, 29 Nov 2018 22:59:51 +0100
Subject: space_server: use dnf_packages when possible

---
 roles/space_server/tasks/avahi.yml    |  9 ---------
 roles/space_server/tasks/bird.yml     |  9 ---------
 roles/space_server/tasks/dhcpd.yml    |  7 -------
 roles/space_server/tasks/nftables.yml |  7 -------
 roles/space_server/tasks/radius.yml   | 10 ----------
 roles/space_server/tasks/radvd.yml    |  7 -------
 roles/space_server/tasks/sshd.yml     |  7 -------
 roles/space_server/tasks/sudo.yml     |  7 -------
 roles/space_server/tasks/unbound.yml  |  9 ---------
 roles/space_server/vars/main.yml      | 16 +++++++++++++++-
 10 files changed, 15 insertions(+), 73 deletions(-)

diff --git a/roles/space_server/tasks/avahi.yml b/roles/space_server/tasks/avahi.yml
index f4decb8..acbcb2a 100644
--- a/roles/space_server/tasks/avahi.yml
+++ b/roles/space_server/tasks/avahi.yml
@@ -1,13 +1,4 @@
 ---
-- name: Install avahi, tools and nss-mdns
-  dnf:
-    name:
-    - avahi-tools # pulls in avahi package
-    - nss-mdns
-    state: present
-  tags:
-  - packages
-
 - name: Configure avahi-daemon
   ini_file:
     path: '/etc/avahi/avahi-daemon.conf'
diff --git a/roles/space_server/tasks/bird.yml b/roles/space_server/tasks/bird.yml
index aeaa7bd..a5cd85a 100644
--- a/roles/space_server/tasks/bird.yml
+++ b/roles/space_server/tasks/bird.yml
@@ -1,13 +1,4 @@
 ---
-- name: Install bird and bird6 packages
-  dnf:
-    name:
-    - bird
-    - bird6
-    state: present
-  tags:
-  - packages
-
 - name: Make sure /etc/bird exists
   file:
     dest: '/etc/bird'
diff --git a/roles/space_server/tasks/dhcpd.yml b/roles/space_server/tasks/dhcpd.yml
index 29d5bc5..79d2f0f 100644
--- a/roles/space_server/tasks/dhcpd.yml
+++ b/roles/space_server/tasks/dhcpd.yml
@@ -1,11 +1,4 @@
 ---
-- name: Install dhcpd package
-  dnf:
-    name: dhcp-server
-    state: present
-  tags:
-  - packages
-
 - name: Configure dhcpd
   template:
     dest: '/etc/dhcp/dhcpd.conf'
diff --git a/roles/space_server/tasks/nftables.yml b/roles/space_server/tasks/nftables.yml
index a589980..9c56714 100644
--- a/roles/space_server/tasks/nftables.yml
+++ b/roles/space_server/tasks/nftables.yml
@@ -7,13 +7,6 @@
     group: root
     mode: 0644
 
-- name: Install nftables package
-  dnf:
-    name: nftables
-    state: present
-  tags:
-  - packages
-
 - name: Configure nftables
   copy:
     dest: '/etc/nftables.conf'
diff --git a/roles/space_server/tasks/radius.yml b/roles/space_server/tasks/radius.yml
index 02bcf2a..a3f4183 100644
--- a/roles/space_server/tasks/radius.yml
+++ b/roles/space_server/tasks/radius.yml
@@ -1,14 +1,4 @@
 ---
-- name: Install freeradius-python, curl and diffutils package
-  dnf:
-    name:
-    - freeradius-python
-    - curl
-    - diffutils
-    state: present
-  tags:
-  - packages
-
 - name: Configure radiusd
   copy:
     dest: '/etc/raddb/{{ item }}'
diff --git a/roles/space_server/tasks/radvd.yml b/roles/space_server/tasks/radvd.yml
index 5824ed1..2d831d1 100644
--- a/roles/space_server/tasks/radvd.yml
+++ b/roles/space_server/tasks/radvd.yml
@@ -1,11 +1,4 @@
 ---
-- name: Install radvd package
-  dnf:
-    name: radvd
-    state: present
-  tags:
-  - packages
-
 - name: Configure radvd
   copy:
     dest: '/etc/radvd.conf'
diff --git a/roles/space_server/tasks/sshd.yml b/roles/space_server/tasks/sshd.yml
index 176ee5a..2f8d35a 100644
--- a/roles/space_server/tasks/sshd.yml
+++ b/roles/space_server/tasks/sshd.yml
@@ -1,11 +1,4 @@
 ---
-- name: Install sshd package
-  dnf:
-    name: openssh-server
-    state: present
-  tags:
-  - packages
-
 - name: Create private host keys
   copy:
     dest: '/etc/ssh/{{ item.key }}'
diff --git a/roles/space_server/tasks/sudo.yml b/roles/space_server/tasks/sudo.yml
index 9db1d55..7125a4b 100644
--- a/roles/space_server/tasks/sudo.yml
+++ b/roles/space_server/tasks/sudo.yml
@@ -1,11 +1,4 @@
 ---
-- name: Install sudo package
-  dnf:
-    name: sudo
-    state: present
-  tags:
-  - packages
-
 - name: Install sudoers file
   copy:
     dest: '/etc/sudoers'
diff --git a/roles/space_server/tasks/unbound.yml b/roles/space_server/tasks/unbound.yml
index a3726a0..9b83c98 100644
--- a/roles/space_server/tasks/unbound.yml
+++ b/roles/space_server/tasks/unbound.yml
@@ -1,13 +1,4 @@
 ---
-- name: Install unbound package
-  dnf:
-    name:
-    - policycoreutils # needed for unbound-keygen.service
-    - unbound
-    state: present
-  tags:
-  - packages
-
 - name: Configure unbound
   template:
     dest: '/etc/unbound/unbound.conf'
diff --git a/roles/space_server/vars/main.yml b/roles/space_server/vars/main.yml
index d1e0918..cd9d18b 100644
--- a/roles/space_server/vars/main.yml
+++ b/roles/space_server/vars/main.yml
@@ -22,11 +22,25 @@ dnf_packages:
   'ansible': present
   'python3-netaddr': present # for dhcpd template
   'git': present
-  'diffutils': present
   'htop': present
   'man-db': present
   'syslinux': present
   'systemd-container': present
+  'sudo': present
+  'nftables': present
+  'openssh-server': present
+  'openssh-clients': present
+  'bird': present
+  'bird6': present
+  'dhcp-server': present
+  'radvd': present
+  'freeradius-python': present # pulls in radiusd
+  'curl': present
+  'diffutils': present
+  'policycoreutils': present # needed for unbound-keygen.service
+  'unbound': present
+  'avahi-tools': present # pulls in avahi package
+  'nss-mdns': present
 
 boot:
   device: 'LABEL=BOOT'
-- 
cgit v1.2.1