diff options
| author | Egor Tensin <egor@tensin.name> | 2025-12-21 22:29:27 +0100 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2025-12-21 22:29:27 +0100 |
| commit | 3b48c12a165a0807946aadf646be3e90ddb86d48 (patch) | |
| tree | f4658281cf45c5c4a46cc41f58003c060b3c0ac7 | |
| parent | wireguard: generic call to include_tasks (diff) | |
| download | infra-ansible-3b48c12a165a0807946aadf646be3e90ddb86d48.tar.gz infra-ansible-3b48c12a165a0807946aadf646be3e90ddb86d48.zip | |
sshd: the systemd service name is different on Ubuntu
| -rw-r--r-- | roles/sshd/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/sshd/vars/Archlinux.yml | 1 | ||||
| -rw-r--r-- | roles/sshd/vars/Debian.yml | 1 | ||||
| -rw-r--r--[l---------] | roles/sshd/vars/Ubuntu.yml | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/roles/sshd/tasks/main.yml b/roles/sshd/tasks/main.yml index 347cb50..9345e9c 100644 --- a/roles/sshd/tasks/main.yml +++ b/roles/sshd/tasks/main.yml @@ -31,11 +31,11 @@ become: true when: sshd_conf is changed ansible.builtin.systemd_service: - name: sshd + name: '{{ __sshd_service_name }}' state: restarted - name: Enable sshd service become: true ansible.builtin.systemd_service: - name: sshd.service + name: '{{ __sshd_service_name }}.service' enabled: true diff --git a/roles/sshd/vars/Archlinux.yml b/roles/sshd/vars/Archlinux.yml index b1d73c4..0c78db7 100644 --- a/roles/sshd/vars/Archlinux.yml +++ b/roles/sshd/vars/Archlinux.yml @@ -1 +1,2 @@ __sshd_sftp_path: /usr/lib/ssh/sftp-server +__sshd_service_name: sshd diff --git a/roles/sshd/vars/Debian.yml b/roles/sshd/vars/Debian.yml index 9d00bf7..f9a8421 100644 --- a/roles/sshd/vars/Debian.yml +++ b/roles/sshd/vars/Debian.yml @@ -1 +1,2 @@ __sshd_sftp_path: /usr/lib/openssh/sftp-server +__sshd_service_name: sshd diff --git a/roles/sshd/vars/Ubuntu.yml b/roles/sshd/vars/Ubuntu.yml index 4e197bc..ea367f9 120000..100644 --- a/roles/sshd/vars/Ubuntu.yml +++ b/roles/sshd/vars/Ubuntu.yml @@ -1 +1,4 @@ -Debian.yml
\ No newline at end of file +__sshd_sftp_path: /usr/lib/openssh/sftp-server +# No idea what on Earth Canonical are smoking, making the service name +# different to Debian's. +__sshd_service_name: ssh |