aboutsummaryrefslogtreecommitdiffstats
path: root/roles/fedora/tasks
diff options
context:
space:
mode:
authorEmil Renner Berthing <esmil@labitat.dk>2021-01-14 17:15:12 +0100
committerEmil Renner Berthing <esmil@labitat.dk>2021-01-17 17:02:09 +0100
commit517597c0f34051711f20d0d4e0cf8a3bbdbfab0d (patch)
treeb79708e6df8152a290a7b9d60e8d797b038aba9f /roles/fedora/tasks
parente4c66ce7cfd4c430e63d19ded8bbc1a5a5f64963 (diff)
downloadlabitat-ansible-517597c0f34051711f20d0d4e0cf8a3bbdbfab0d.tar.gz
labitat-ansible-517597c0f34051711f20d0d4e0cf8a3bbdbfab0d.tar.xz
labitat-ansible-517597c0f34051711f20d0d4e0cf8a3bbdbfab0d.zip
space_server: update for Fedora 33
Diffstat (limited to 'roles/fedora/tasks')
-rw-r--r--roles/fedora/tasks/networkd.yml2
-rw-r--r--roles/fedora/tasks/sshd.yml6
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/fedora/tasks/networkd.yml b/roles/fedora/tasks/networkd.yml
index 35a45d1..dea53e1 100644
--- a/roles/fedora/tasks/networkd.yml
+++ b/roles/fedora/tasks/networkd.yml
@@ -10,7 +10,7 @@
value: "{{ (item.value is string)|ternary(item.value,omit) }}"
state: "{{ (item.value is string)|ternary('present','absent') }}"
with_dict: '{{ networkd_conf }}'
- when: use_networkd and (ansible_distribution_version == 'rawhide' or ansible_distribution_version|int > 29
+ when: use_networkd
- name: Enable/disable systemd-networkd
systemd:
diff --git a/roles/fedora/tasks/sshd.yml b/roles/fedora/tasks/sshd.yml
index 91f08ec..fc46c07 100644
--- a/roles/fedora/tasks/sshd.yml
+++ b/roles/fedora/tasks/sshd.yml
@@ -29,11 +29,11 @@
regexp: '{{ item.regexp }}'
line: '{{ item.line }}'
with_items:
- - regexp: '^[# ]*PermitRootLogin'
+ - regexp: '^#*PermitRootLogin'
line: 'PermitRootLogin no'
- - regexp: '^PasswordAuthentication'
+ - regexp: '^#*PasswordAuthentication'
line: 'PasswordAuthentication no'
- - regexp: '^[# ]*GSSAPIAuthentication'
+ - regexp: '^#*GSSAPIAuthentication'
line: 'GSSAPIAuthentication no'
notify: restart sshd