diff options
Diffstat (limited to 'roles/fedora')
| -rw-r--r-- | roles/fedora/tasks/networkd.yml | 2 | ||||
| -rw-r--r-- | roles/fedora/tasks/sshd.yml | 6 |
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 |