Refactor naming of packages and services to follow same conventions

17 files changed, 24 insertions, 24 deletions

diff --git a/roles/grafana/handlers/main.yml b/roles/grafana/handlers/main.yml
index d366343b..408c8c3d 100644
--- a/roles/grafana/handlers/main.yml
+++ b/roles/grafana/handlers/main.yml
@@ -2,5 +2,5 @@
 - name: "Restart grafana"
   become: true
   ansible.builtin.systemd_service:
-    name: "{{ grafana_service_name }}"
+    name: "{{ grafana_service }}"
     state: "restarted"
diff --git a/roles/grafana/tasks/main.yml b/roles/grafana/tasks/main.yml
index 67bcccdb..5cae1990 100644
--- a/roles/grafana/tasks/main.yml
+++ b/roles/grafana/tasks/main.yml
@@ -82,6 +82,6 @@
 - name: "Start and enable grafana"
   become: true
   ansible.builtin.systemd_service:
-    name: "{{ grafana_service_name }}"
+    name: "{{ grafana_service }}"
     state: "started"
     enabled: true
diff --git a/roles/grafana/vars/archlinux.yml b/roles/grafana/vars/archlinux.yml
index 29758e8d..5cd0b3dc 100644
--- a/roles/grafana/vars/archlinux.yml
+++ b/roles/grafana/vars/archlinux.yml
@@ -1,3 +1,3 @@
 ---
-grafana_service_name: "grafana"
+grafana_service: "grafana"
 grafana_config_file: "/etc/grafana.ini"
diff --git a/roles/grafana/vars/debian.yml b/roles/grafana/vars/debian.yml
index 8e8a1f71..d9e3e9b3 100644
--- a/roles/grafana/vars/debian.yml
+++ b/roles/grafana/vars/debian.yml
@@ -1,3 +1,3 @@
 ---
-grafana_service_name: "grafana-server"
+grafana_service: "grafana-server"
 grafana_config_file: "/etc/grafana/grafana.ini"
diff --git a/roles/locales/tasks/main.yml b/roles/locales/tasks/main.yml
index 9a0ec6ee..e68426af 100644
--- a/roles/locales/tasks/main.yml
+++ b/roles/locales/tasks/main.yml
@@ -5,7 +5,7 @@
 - name: "Ensure locales package is installed"
   become: true
   ansible.builtin.package:
-    name: "{{ locales_pkg }}"
+    name: "{{ locales_package }}"
     state: "present"
 
 - name: "Read locale.gen file"
diff --git a/roles/locales/vars/archlinux.yml b/roles/locales/vars/archlinux.yml
index 10e7754b..aacd6dab 100644
--- a/roles/locales/vars/archlinux.yml
+++ b/roles/locales/vars/archlinux.yml
@@ -1,2 +1,2 @@
 ---
-locales_pkg: "glibc"
+locales_package: "glibc"
diff --git a/roles/locales/vars/debian.yml b/roles/locales/vars/debian.yml
index 0bd86457..0af057a8 100644
--- a/roles/locales/vars/debian.yml
+++ b/roles/locales/vars/debian.yml
@@ -1,2 +1,2 @@
 ---
-locales_pkg: "locales"
+locales_package: "locales"
diff --git a/roles/password_policy/tasks/main.yml b/roles/password_policy/tasks/main.yml
index 10aa3837..5d51bf16 100644
--- a/roles/password_policy/tasks/main.yml
+++ b/roles/password_policy/tasks/main.yml
@@ -5,7 +5,7 @@
 - name: "Ensure password_policy package is installed"
   become: true
   ansible.builtin.package:
-    name: "{{ password_policy_pkg }}"
+    name: "{{ password_policy_package }}"
     state: "present"
 
 - name: "Configure archlinux password policy"
diff --git a/roles/password_policy/vars/archlinux.yml b/roles/password_policy/vars/archlinux.yml
index 59d439d6..0e687457 100644
--- a/roles/password_policy/vars/archlinux.yml
+++ b/roles/password_policy/vars/archlinux.yml
@@ -1,2 +1,2 @@
 ---
-password_policy_pkg: "libpwquality"
+password_policy_package: "libpwquality"
diff --git a/roles/password_policy/vars/debian.yml b/roles/password_policy/vars/debian.yml
index cb52b37d..891e3944 100644
--- a/roles/password_policy/vars/debian.yml
+++ b/roles/password_policy/vars/debian.yml
@@ -1,2 +1,2 @@
 ---
-password_policy_pkg: "libpam-pwquality"
+password_policy_package: "libpam-pwquality"
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"
diff --git a/roles/wireguard/tasks/main.yml b/roles/wireguard/tasks/main.yml
index 070e73d2..78209685 100644
--- a/roles/wireguard/tasks/main.yml
+++ b/roles/wireguard/tasks/main.yml
@@ -5,7 +5,7 @@
 - name: "Ensure wireguard is installed"
   become: true
   ansible.builtin.package:
-    name: "{{ wireguard_pkgs }}"
+    name: "{{ wireguard_packages }}"
     state: "present"
 
 - name: "Deploy WireGuard configurations"
diff --git a/roles/wireguard/vars/archlinux.yml b/roles/wireguard/vars/archlinux.yml
index 9afa94e4..6a5a696b 100644
--- a/roles/wireguard/vars/archlinux.yml
+++ b/roles/wireguard/vars/archlinux.yml
@@ -1,4 +1,4 @@
 ---
-wireguard_pkgs:
+wireguard_packages:
   - "wireguard-tools"
   - "systemd-resolvconf"
diff --git a/roles/wireguard/vars/debian.yml b/roles/wireguard/vars/debian.yml
index d98f40cb..4619a563 100644
--- a/roles/wireguard/vars/debian.yml
+++ b/roles/wireguard/vars/debian.yml
@@ -1,3 +1,3 @@
 ---
-wireguard_pkgs:
+wireguard_packages:
   - "wireguard"