diff options
| author | Ahmed Abdelhalim <[email protected]> | 2025-10-22 14:29:02 +0200 |
|---|---|---|
| committer | Ahmed Abdelhalim <[email protected]> | 2025-10-22 14:53:36 +0200 |
| commit | 3bcf7bd2adb443b881365506dfa3348b0c465264 (patch) | |
| tree | 674f29db0c799c0984d92d1cb42f12855a0b4b90 /roles/ssh | |
| parent | 1f2116f2adc947410d1549b982b76e1616c3abbb (diff) | |
Refactor naming of packages and services to follow same conventions
Diffstat (limited to 'roles/ssh')
| -rw-r--r-- | roles/ssh/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/ssh/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/ssh/vars/archlinux.yml | 4 | ||||
| -rw-r--r-- | roles/ssh/vars/debian.yml | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/roles/ssh/handlers/main.yml b/roles/ssh/handlers/main.yml index a73aca7e..f8760549 100644 --- a/roles/ssh/handlers/main.yml +++ b/roles/ssh/handlers/main.yml @@ -8,6 +8,6 @@ - name: "Restart ssh" become: true ansible.builtin.systemd_service: - name: "{{ ssh_service_name }}" + name: "{{ ssh_service }}" state: "restarted" when: not ansible_is_chroot diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml index 2e26ad7d..6e61f51b 100644 --- a/roles/ssh/tasks/main.yml +++ b/roles/ssh/tasks/main.yml @@ -2,24 +2,24 @@ - name: "Include OS-specific variables" ansible.builtin.include_vars: "{{ ansible_os_family | lower }}.yml" -- name: "Ensure ssh_package_name installed" +- name: "Ensure ssh package is installed" become: true ansible.builtin.package: - name: "{{ ssh_package_name }}" + name: "{{ ssh_package }}" state: "present" -- name: "Ensure ssh_service_name is enabled" +- name: "Ensure ssh service is enabled" become: true ansible.builtin.service: - name: "{{ ssh_service_name }}" + name: "{{ ssh_service }}" state: "started" enabled: true when: not ansible_is_chroot -- name: "(chroot): Ensure ssh_service_name is enabled" +- name: "(chroot): Ensure ssh service is enabled" # noqa: command-instead-of-module intentional isnide chroot ansible.builtin.command: - cmd: "systemctl enable {{ ssh_service_name }}" + cmd: "systemctl enable {{ ssh_service }}" when: ansible_is_chroot changed_when: true diff --git a/roles/ssh/vars/archlinux.yml b/roles/ssh/vars/archlinux.yml index 98fa3cc2..5a16189a 100644 --- a/roles/ssh/vars/archlinux.yml +++ b/roles/ssh/vars/archlinux.yml @@ -1,3 +1,3 @@ --- -ssh_package_name: "openssh" -ssh_service_name: "sshd" +ssh_package: "openssh" +ssh_service: "sshd" diff --git a/roles/ssh/vars/debian.yml b/roles/ssh/vars/debian.yml index 617aaac9..075ee597 100644 --- a/roles/ssh/vars/debian.yml +++ b/roles/ssh/vars/debian.yml @@ -1,3 +1,3 @@ --- -ssh_package_name: "openssh-server" -ssh_service_name: "ssh" +ssh_package: "openssh-server" +ssh_service: "ssh" |