aboutsummaryrefslogtreecommitdiffstats
path: root/roles/space_server
diff options
context:
space:
mode:
authorEmil Renner Berthing <esmil@labitat.dk>2018-10-06 22:56:32 +0200
committerEmil Renner Berthing <esmil@labitat.dk>2018-11-11 11:24:34 +0100
commit2df419d71028a4f699a98d897439b89e15f4e72a (patch)
tree0917b0f6582bf26d4eecb029a0660834e4adef2e /roles/space_server
parent18a6c64179d45e94466f0598a49ea34fe23fe3eb (diff)
downloadlabitat-ansible-2df419d71028a4f699a98d897439b89e15f4e72a.tar.gz
labitat-ansible-2df419d71028a4f699a98d897439b89e15f4e72a.tar.xz
labitat-ansible-2df419d71028a4f699a98d897439b89e15f4e72a.zip
fedora: align with debian role
Diffstat (limited to 'roles/space_server')
-rw-r--r--roles/space_server/tasks/main.yml4
-rw-r--r--roles/space_server/tasks/networkd.yml13
-rw-r--r--roles/space_server/tasks/resolved.yml34
-rw-r--r--roles/space_server/tasks/timesyncd.yml15
-rw-r--r--roles/space_server/vars/main.yml10
5 files changed, 2 insertions, 74 deletions
diff --git a/roles/space_server/tasks/main.yml b/roles/space_server/tasks/main.yml
index 294d655..ba6e8ca 100644
--- a/roles/space_server/tasks/main.yml
+++ b/roles/space_server/tasks/main.yml
@@ -15,10 +15,6 @@
tags: kernel
- import_tasks: gettys.yml
tags: gettys
-- import_tasks: timesyncd.yml
- tags: timesyncd
-- import_tasks: resolved.yml
- tags: resolved
- import_tasks: networkd.yml
tags: networkd
- import_tasks: nftables.yml
diff --git a/roles/space_server/tasks/networkd.yml b/roles/space_server/tasks/networkd.yml
index 6b0ff48..0059ed6 100644
--- a/roles/space_server/tasks/networkd.yml
+++ b/roles/space_server/tasks/networkd.yml
@@ -44,17 +44,4 @@
group: root
mode: 0644
-- name: Enable systemd-networkd
- systemd:
- name: systemd-networkd.service
- enabled: yes
- masked: no
- state: started
- when: not chroot
-- name: '- when in chroot'
- command: systemctl enable systemd-networkd.service
- args:
- creates: '/etc/systemd/system/multi-user.target.wants/systemd-networkd.service'
- when: chroot
-
# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/resolved.yml b/roles/space_server/tasks/resolved.yml
deleted file mode 100644
index 1bbae10..0000000
--- a/roles/space_server/tasks/resolved.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-#- name: Enable systemd-resolved
-# systemd:
-# name: systemd-resolved.service
-# enabled: yes
-# masked: no
-# state: started
-# when: not chroot
-#- name: '- when in chroot'
-# command: systemctl enable systemd-resolved.service
-# args:
-# creates: '/etc/systemd/system/multi-user.target.wants/systemd-resolved.service'
-# when: chroot
-#
-#- name: Use systemd-resolved
-# lineinfile:
-# path: '/etc/nsswitch.conf'
-# regexp: '^hosts:'
-# line: 'hosts: files resolve [!UNAVAIL=return] dns myhostname'
-
-- name: Disable systemd-resolved
- systemd:
- name: systemd-resolved.service
- enabled: no
- masked: no
- state: stopped
- when: not chroot
-- name: '- when in chroot'
- command: systemctl disable systemd-resolved.service
- args:
- removes: '/etc/systemd/system/multi-user.target.wants/systemd-resolved.service'
- when: chroot
-
-# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/timesyncd.yml b/roles/space_server/tasks/timesyncd.yml
deleted file mode 100644
index 3217889..0000000
--- a/roles/space_server/tasks/timesyncd.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Enable systemd-timesyncd
- systemd:
- name: systemd-timesyncd.service
- enabled: yes
- masked: no
- state: started
- when: not chroot
-- name: '- when in chroot'
- command: systemctl enable systemd-timesyncd.service
- args:
- creates: '/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service'
- when: chroot
-
-# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/vars/main.yml b/roles/space_server/vars/main.yml
index 0778f2e..d1e0918 100644
--- a/roles/space_server/vars/main.yml
+++ b/roles/space_server/vars/main.yml
@@ -1,6 +1,8 @@
---
hostname: 'space'
+use_resolved: false
+
locale:
default:
LANG: 'da_DK.UTF-8'
@@ -14,23 +16,15 @@ dnf_conf:
dnf_packages:
'glibc-langpack-da': present
- 'glibc-langpack-en': present
- 'initscripts': present
- 'hostname': present
'iproute': present
'dosfstools': present
'btrfs-progs': present
- 'dnf': present
- 'dnf-command(leaves)': present
- 'python-unversioned-command': present
'ansible': present
'python3-netaddr': present # for dhcpd template
- 'vim-enhanced': present
'git': present
'diffutils': present
'htop': present
'man-db': present
- 'passwd': present
'syslinux': present
'systemd-container': present