roles/backup-data-to-usb/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload backup-data-to-usb.cymais.service"
+- name: "reload backup-data-to-usb.service"
   systemd:
-    name: backup-data-to-usb.cymais.service
+    name: backup-data-to-usb.service
     state: reloaded
     daemon_reload: yes

roles/backup-data-to-usb/tasks/main.yml

@@ -9,8 +9,8 @@
 - name: Copy systemd service to systemd directory
   template:
     src: backup-data-to-usb.service.j2
-    dest: /etc/systemd/system/backup-data-to-usb.cymais.service
+    dest: /etc/systemd/system/backup-data-to-usb.service
     owner: root
     group: root
     mode: '0644'
-  notify: reload backup-data-to-usb.cymais.service
+  notify: reload backup-data-to-usb.service

roles/backup-data-to-usb/templates/backup-data-to-usb.service.j2

@@ -1,11 +1,11 @@
 [Unit]
 Description=Backup to USB when mounted to {{ backup_to_usb_mount }}
 Wants={{systemctl_mount_service_name}}
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 ExecStart=/bin/python {{ backup_to_usb_script_path }} {{backup_to_usb_source}} {{backup_to_usb_destination}}
-ExecStartPost=/bin/systemctl start cleanup-backups.cymais.service
+ExecStartPost=/bin/systemctl start cleanup-backups.service
 
 [Install]
 WantedBy=multi-user.target

roles/backup-docker-to-local/handlers/main.yml

@@ -1,4 +1,4 @@
-- name: "reload backup-docker-to-local.cymais.service"
+- name: "reload backup-docker-to-local.service"
   systemd:
-    name: backup-docker-to-local.cymais.service
+    name: backup-docker-to-local.service
     daemon_reload: yes

roles/backup-docker-to-local/tasks/main.yml

@@ -14,18 +14,18 @@
   ignore_errors: true
   when: run_once_backup_docker_to_local is not defined
 
-- name: configure backup-docker-to-local-everything.cymais.service
+- name: configure backup-docker-to-local-everything.service
   template: 
     src: backup-docker-to-local-everything.service.j2
-    dest: /etc/systemd/system/backup-docker-to-local-everything.cymais.service
+    dest: /etc/systemd/system/backup-docker-to-local-everything.service
-  notify: reload backup-docker-to-local-everything.cymais.service
+  notify: reload backup-docker-to-local-everything.service
   when: run_once_backup_docker_to_local is not defined
 
-- name: configure backup-docker-to-local.cymais.service
+- name: configure backup-docker-to-local.service
   template: 
     src: backup-docker-to-local.service.j2
-    dest: /etc/systemd/system/backup-docker-to-local.cymais.service
+    dest: /etc/systemd/system/backup-docker-to-local.service
-  notify: reload backup-docker-to-local.cymais.service
+  notify: reload backup-docker-to-local.service
   when: run_once_backup_docker_to_local is not defined
 
 - name: set service_name to the name of the current role

roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=backup docker volumes to local folder
-OnFailure=systemd-notifier.cymais@%n.service cleanup-failed-docker-backups.cymais.service
+OnFailure=systemd-notifier@%n.service cleanup-failed-docker-backups.service
 
 [Service]
 Type=oneshot

roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=backup docker volumes to local folder
-OnFailure=systemd-notifier.cymais@%n.service cleanup-failed-docker-backups.cymais.service
+OnFailure=systemd-notifier@%n.service cleanup-failed-docker-backups.service
 
 [Service]
 Type=oneshot

roles/backup-remote-to-local/README.md

@@ -15,12 +15,12 @@ To track what the service is doing execute one of the following commands:
 
 #### systemctl
 ```bash
-  watch -n2 "systemctl status backup-remote-to-local.cymais.service"
+  watch -n2 "systemctl status backup-remote-to-local.service"
 ```
 
 #### journalctl
 ```bash
-  journalctl -fu backup-remote-to-local.cymais.service
+  journalctl -fu backup-remote-to-local.service
 ```  
 
 ### history

roles/backup-remote-to-local/handlers/main.yml

@@ -1,11 +1,11 @@
 - name: "reload backup-remote-to-local service"
   systemd:
-    name: backup-remote-to-local.cymais.service
+    name: backup-remote-to-local.service
     daemon_reload: yes
     
 - name: "restart backup-remote-to-local timer"
   systemd:
-    name: backup-remote-to-local.cymais.timer
+    name: backup-remote-to-local.timer
     state: started
     enabled: yes
     daemon_reload: yes

roles/backup-remote-to-local/tasks/main.yml

@@ -10,10 +10,8 @@
     dest: "{{docker_backup_remote_to_local_folder}}backup-remote-to-local.sh"
     mode: 0755
 
-- name: create backup-remote-to-local.cymais.service
+- name: create backup-remote-to-local.service
-  template: 
+  template: src=backup-remote-to-local.service.j2 dest=/etc/systemd/system/backup-remote-to-local.service
-    src:  backup-remote-to-local.service.j2 
-    dest: /etc/systemd/system/backup-remote-to-local.cymais.service
   notify: reload backup-remote-to-local service
 
 - name: create backups-remote-to-local.sh

roles/backup-remote-to-local/templates/backup-remote-to-local.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=pull remote backups
-OnFailure=systemd-notifier.cymais@%n.service cleanup-failed-docker-backups.cymais.service
+OnFailure=systemd-notifier@%n.service cleanup-failed-docker-backups.service
 
 [Service]
 Type=oneshot

roles/cleanup-backups-service/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload cleanup-backups.cymais.service"
+- name: "reload cleanup-backups.service"
   systemd:
-    name: cleanup-backups.cymais.service
+    name: cleanup-backups.service
     enabled: yes
     daemon_reload: yes

roles/cleanup-backups-service/tasks/main.yml

@@ -19,11 +19,11 @@
     dest: "{{docker_cleanup_backups}}cleanup-backups.py"
   when: run_once_cleanup_backups_service is not defined
 
-- name: create cleanup-backups.cymais.service
+- name: create cleanup-backups.service
   template: 
     src:  "cleanup-backups.service.j2"
-    dest: "/etc/systemd/system/cleanup-backups.cymais.service"
+    dest: "/etc/systemd/system/cleanup-backups.service"
-  notify: reload cleanup-backups.cymais.service
+  notify: reload cleanup-backups.service
   when: run_once_cleanup_backups_service is not defined
 
 - name: run the cleanup_backups_service tasks once

roles/cleanup-backups-service/templates/cleanup-backups.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=delete old backups
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/cleanup-disc-space/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload cleanup-disc-space.cymais.service"
+- name: "reload cleanup-disc-space.service"
   systemd:
-    name: cleanup-disc-space.cymais.service
+    name: cleanup-disc-space.service
     enabled: yes
     daemon_reload: yes

roles/cleanup-disc-space/tasks/main.yml

@@ -9,11 +9,11 @@
     src: cleanup-disc-space.sh.j2
     dest: "{{cleanup_disc_space_folder}}cleanup-disc-space.sh"
 
-- name: create cleanup-disc-space.cymais.service
+- name: create cleanup-disc-space.service
   template: 
     src: cleanup-disc-space.service.j2
-    dest: /etc/systemd/system/cleanup-disc-space.cymais.service
+    dest: /etc/systemd/system/cleanup-disc-space.service
-  notify: reload cleanup-disc-space.cymais.service
+  notify: reload cleanup-disc-space.service
 
 - name: set service_name to the name of the current role
   set_fact:

roles/cleanup-disc-space/templates/cleanup-disc-space.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=freeing disc space
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/cleanup-failed-docker-backups/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload cleanup-failed-docker-backups.cymais.service daemon"
+- name: "reload cleanup-failed-docker-backups.service daemon"
   systemd:
-    name: cleanup-failed-docker-backups.cymais.service
+    name: cleanup-failed-docker-backups.service
     enabled: yes
     daemon_reload: yes

roles/cleanup-failed-docker-backups/tasks/main.yml

@@ -6,11 +6,11 @@
   ignore_errors: true
   when: run_once_cleanup_failed_docker_backups is not defined
 
-- name: configure cleanup-failed-docker-backups.cymais.service
+- name: configure cleanup-failed-docker-backups.service
   template: 
     src: cleanup-failed-docker-backups.service.j2
-    dest: /etc/systemd/system/cleanup-failed-docker-backups.cymais.service
+    dest: /etc/systemd/system/cleanup-failed-docker-backups.service
-  notify: reload cleanup-failed-docker-backups.cymais.service daemon
+  notify: reload cleanup-failed-docker-backups.service daemon
   when: run_once_cleanup_failed_docker_backups is not defined
 
 - name: set service_name to the name of the current role

roles/cleanup-failed-docker-backups/templates/cleanup-failed-docker-backups.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Cleaning up failed docker volume backups
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/client-wireguard/files/set-mtu.service

@@ -1,10 +1,10 @@
 [Unit]
 Description=set MTU 
-Before=wg-quick@wg0.cymais.service
+Before=wg-quick@wg0.service
 
 [Service]
 Type=oneshot
 ExecStart=bash /usr/local/bin/set-mtu.sh
 
 [Install]
-RequiredBy=wg-quick@wg0.cymais.service
+RequiredBy=wg-quick@wg0.service

roles/client-wireguard/handlers/main.yml

@@ -1,6 +1,6 @@
-- name: "restart set-mtu.cymais.service"
+- name: "restart set-mtu.service"
   systemd:
-    name: set-mtu.cymais.service
+    name: set-mtu.service
     state: restarted
     enabled: yes
     daemon_reload: yes

roles/client-wireguard/tasks/main.yml

@@ -1,11 +1,11 @@
-- name: create set-mtu.cymais.service
+- name: create set-mtu.service
   copy: 
     src:  set-mtu.service
-    dest: /etc/systemd/system/set-mtu.cymais.service
+    dest: /etc/systemd/system/set-mtu.service
-  notify: restart set-mtu.cymais.service
+  notify: restart set-mtu.service
 
 - name: create set-mtu.sh
   template: 
     src:  set-mtu.sh.j2
     dest: /usr/local/bin/set-mtu.sh
-  notify: restart set-mtu.cymais.service
+  notify: restart set-mtu.service

roles/docker-mailu/handlers/main.yml

@@ -1,7 +1,7 @@
 ---
-- name: "restart deploy-letsencrypt-mailu.cymais.service"
+- name: "restart deploy-letsencrypt-mailu.service"
   systemd:
-    name: deploy-letsencrypt-mailu.cymais.service
+    name: deploy-letsencrypt-mailu.service
     state: restarted
     enabled: yes
     daemon_reload: yes

roles/docker-mailu/tasks/main.yml

@@ -48,11 +48,11 @@
     src: "deploy-letsencrypt-mailu.sh.j2" 
     dest: "{{path_administrator_scripts}}mailu/deploy-letsencrypt-mailu.sh"
 
-- name: configure deploy-letsencrypt-mailu.cymais.service
+- name: configure deploy-letsencrypt-mailu.service
   template: 
     src:  "deploy-letsencrypt-mailu.service.j2"
-    dest: "/etc/systemd/system/deploy-letsencrypt-mailu.cymais.service"
+    dest: "/etc/systemd/system/deploy-letsencrypt-mailu.service"
-  notify: restart deploy-letsencrypt-mailu.cymais.service
+  notify: restart deploy-letsencrypt-mailu.service
 
 - name: "include role for systemd-timer for {{service_name}}"
   include_role:

roles/docker-mailu/templates/deploy-letsencrypt-mailu.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Let's Encrypt Mailu Deploy
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/driver-msi-keyboard-color/tasks/setup_timers.yml

@@ -1,16 +1,16 @@
 ---
-- name: Copy keyboard-color.cymais.timer file
+- name: Copy keyboard-color.timer file
   template:
     src: keyboard-color.timer.j2
-    dest: /etc/systemd/system/keyboard-color.cymais.timer
+    dest: /etc/systemd/system/keyboard-color.timer
     mode: 0644
   tags:
     - keyboard-color
 
-- name: Copy keyboard-color.cymais.service file
+- name: Copy keyboard-color.service file
   template:
     src: keyboard-color.service.j2
-    dest: /etc/systemd/system/keyboard-color.cymais.service
+    dest: /etc/systemd/system/keyboard-color.service
     mode: 0644
   tags:
     - keyboard-color
@@ -21,9 +21,9 @@
   tags:
     - keyboard-color
 
-- name: Enable and start keyboard-color.cymais.timer
+- name: Enable and start keyboard-color.timer
   systemd:
-    name: keyboard-color.cymais.timer
+    name: keyboard-color.timer
     state: restarted
     enabled: yes
   tags:

roles/driver-msi-keyboard-color/templates/keyboard-color.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Keyboard Color Service
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/heal-docker/files/heal-docker.py

@@ -40,8 +40,8 @@ waiting_time=600
 blocker_running=True
 while blocker_running:
     try: 
-        bash("systemctl is-active --quiet backup-docker-to-local.cymais.service")
+        bash("systemctl is-active --quiet backup-docker-to-local.service")
-        bash("systemctl is-active --quiet update-docker.cymais.service")
+        bash("systemctl is-active --quiet update-docker.service")
         print("backup is running.")
         print("trying again in  " + str(waiting_time) + " seconds.")
         time.sleep(waiting_time)

roles/heal-docker/handlers/main.yml

@@ -1,4 +1,4 @@
-- name: "reload heal-docker.cymais.service"
+- name: "reload heal-docker.service"
   systemd:
-    name: heal-docker.cymais.service
+    name: heal-docker.service
     daemon_reload: yes

roles/heal-docker/tasks/main.yml

@@ -11,11 +11,11 @@
     dest: "{{heal_docker}}heal-docker.py"
   when: run_once_heal_docker is not defined
 
-- name: create heal-docker.cymais.service
+- name: create heal-docker.service
   template: 
     src: heal-docker.service.j2 
-    dest: /etc/systemd/system/heal-docker.cymais.service
+    dest: /etc/systemd/system/heal-docker.service
-  notify: reload heal-docker.cymais.service
+  notify: reload heal-docker.service
   when: run_once_heal_docker is not defined
 
 - name: set service_name to the name of the current role

roles/heal-docker/templates/heal-docker.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=restart unhealthy docker containers
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/health-btrfs/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload health-btrfs.cymais.service"
+- name: "reload health-btrfs.service"
   systemd:
-    name: health-btrfs.cymais.service
+    name: health-btrfs.service
     enabled: yes
     daemon_reload: yes

roles/health-btrfs/tasks/main.yml

@@ -9,11 +9,11 @@
     src: health-btrfs.sh
     dest: "{{docker_health_btrfs_folder}}health-btrfs.sh"
 
-- name: create health-btrfs.cymais.service
+- name: create health-btrfs.service
   template: 
     src: health-btrfs.service.j2
-    dest: /etc/systemd/system/health-btrfs.cymais.service
+    dest: /etc/systemd/system/health-btrfs.service
-  notify: reload health-btrfs.cymais.service
+  notify: reload health-btrfs.service
 
 - name: set service_name to the name of the current role
   set_fact:

roles/health-btrfs/templates/health-btrfs.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Check btrfs status
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/health-disc-space/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload health-disc-space.cymais.service"
+- name: "reload health-disc-space.service"
   systemd:
-    name: health-disc-space.cymais.service
+    name: health-disc-space.service
     enabled: yes
     daemon_reload: yes

roles/health-disc-space/tasks/main.yml

@@ -9,11 +9,11 @@
     src: health-disc-space.sh
     dest: "{{health_disc_space_folder}}health-disc-space.sh"
 
-- name: create health-disc-space.cymais.service
+- name: create health-disc-space.service
   template: 
     src: health-disc-space.service.j2
-    dest: /etc/systemd/system/health-disc-space.cymais.service
+    dest: /etc/systemd/system/health-disc-space.service
-  notify: reload health-disc-space.cymais.service
+  notify: reload health-disc-space.service
 
 - name: set service_name to the name of the current role
   set_fact:

roles/health-disc-space/templates/health-disc-space.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=checking disc space
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/health-docker-container/README.md

@@ -10,8 +10,8 @@ This Ansible role is designed to ensure the health of Docker containers running
 - `handlers/main.yml`: Handlers to reload and restart the systemd service and timer.
 - `files/health-docker-container.sh`: The script that checks the container health.
 - `tasks/main.yml`: Tasks to create necessary directories, copy scripts, and create systemd service and timer.
-- `templates/health-docker-container.cymais.service.j2`: Systemd service template.
+- `templates/health-docker-container.service.j2`: Systemd service template.
-- `templates/health-docker-container.cymais.timer.j2`: Systemd timer template.
+- `templates/health-docker-container.timer.j2`: Systemd timer template.
 - `meta/main.yml`: Meta information declaring dependencies for the role.
 
 ## Usage

roles/health-docker-container/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload health-docker-container.cymais.service"
+- name: "reload health-docker-container.service"
   systemd:
-    name: health-docker-container.cymais.service
+    name: health-docker-container.service
     enabled: yes
     daemon_reload: yes

roles/health-docker-container/tasks/main.yml

@@ -11,11 +11,9 @@
     dest: "{{health_docker_container_folder}}health-docker-container.sh"
   when: run_once_health_docker_container is not defined
 
-- name: create health-docker-container.cymais.service
+- name: create health-docker-container.service
-  template: 
+  template: src=health-docker-container.service.j2 dest=/etc/systemd/system/health-docker-container.service
-    src:  health-docker-container.service.j2
+  notify: reload health-docker-container.service
-    dest: /etc/systemd/system/health-docker-container.cymais.service
-  notify: reload health-docker-container.cymais.service
   when: run_once_health_docker_container is not defined
 
 - name: set service_name to the name of the current role

roles/health-docker-container/templates/health-docker-container.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Checking docker health
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/health-docker-volumes/README.md

@@ -10,8 +10,8 @@ This role checks for anonymous Docker volumes that are not bound to a container
 - `handlers/main.yml`: Handlers to reload and restart the systemd service and timer.
 - `files/health-docker-volumes.sh`: The script that checks for anonymous Docker volumes and excludes whitelisted volumes.
 - `tasks/main.yml`: Tasks to create necessary directories, copy scripts, and create systemd service and timer.
-- `templates/health-docker-volumes.cymais.service.j2`: Systemd service template, including the whitelisted volumes as a parameter.
+- `templates/health-docker-volumes.service.j2`: Systemd service template, including the whitelisted volumes as a parameter.
-- `templates/health-docker-volumes.cymais.timer.j2`: Systemd timer template.
+- `templates/health-docker-volumes.timer.j2`: Systemd timer template.
 - `meta/main.yml`: Meta information declaring dependencies for the role.
 
 ## Usage

roles/health-docker-volumes/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload health-docker-volumes.cymais.service"
+- name: "reload health-docker-volumes.service"
   systemd:
-    name: health-docker-volumes.cymais.service
+    name: health-docker-volumes.service
     enabled: yes
     daemon_reload: yes

roles/health-docker-volumes/tasks/main.yml

@@ -11,11 +11,9 @@
     dest: "{{health_docker_volumes_folder}}health-docker-volumes.sh"
   when: run_once_health_docker_volumes is not defined
 
-- name: create health-docker-volumes.cymais.service
+- name: create health-docker-volumes.service
-  template:
+  template: src=health-docker-volumes.service.j2 dest=/etc/systemd/system/health-docker-volumes.service
-    src:  health-docker-volumes.service.j2
+  notify: reload health-docker-volumes.service
-    dest: /etc/systemd/system/health-docker-volumes.cymais.service
-  notify: reload health-docker-volumes.cymais.service
   when: run_once_health_docker_volumes is not defined
 
 - name: set service_name to the name of the current role

roles/health-docker-volumes/templates/health-docker-volumes.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Checking docker health
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/health-journalctl/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload health-journalctl.cymais.service"
+- name: "reload health-journalctl.service"
   systemd:
-    name: health-journalctl.cymais.service
+    name: health-journalctl.service
     enabled: yes
     daemon_reload: yes

roles/health-journalctl/tasks/main.yml

@@ -11,11 +11,11 @@
     dest: "{{health_journalctl_folder}}health-journalctl.sh"
   when: run_once_health_journalctl is not defined
 
-- name: create health-journalctl.cymais.service
+- name: create health-journalctl.service
   template: 
     src: health-journalctl.service.j2
-    dest: /etc/systemd/system/health-journalctl.cymais.service
+    dest: /etc/systemd/system/health-journalctl.service
-  notify: reload health-journalctl.cymais.service
+  notify: reload health-journalctl.service
   when: run_once_health_journalctl is not defined
 
 - name: set service_name to the name of the current role

roles/health-journalctl/templates/health-journalctl.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=checking journalctl health
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/health-nginx/README.md

@@ -26,12 +26,12 @@ This role depends on:
 ## Usage
 1. **Installation of Python Modules**: The role installs the required Python `requests` module.
 2. **File and Directory Management**: It creates the necessary directories and files, including the `health-nginx.py` script.
-3. **Service and Timer Templates**: Templates for `health-nginx.cymais.service` and `health-nginx.cymais.timer` are set up to automate the health checks.
+3. **Service and Timer Templates**: Templates for `health-nginx.service` and `health-nginx.timer` are set up to automate the health checks.
 4. **Running the Health Check**: The `health-nginx.py` script is executed to perform the health check. It iterates over nginx configuration files and sends a HEAD request to each domain/subdomain to verify its status. The script considers different expected status codes based on the domain or subdomain.
 
 ## Handler Details
-- **reload health-nginx.cymais.service**: Reloads the `health-nginx.cymais.service` if there are any changes to the service file.
+- **reload health-nginx.service**: Reloads the `health-nginx.service` if there are any changes to the service file.
-- **restart health-nginx.cymais.timer**: Restarts and enables the `health-nginx.cymais.timer` to schedule regular health checks.
+- **restart health-nginx.timer**: Restarts and enables the `health-nginx.timer` to schedule regular health checks.
 
 ## Additional Information
 - For more details on nginx configurations, visit [nginx documentation](https://nginx.org/en/docs/).

roles/health-nginx/handlers/main.yml

@@ -1,5 +1,5 @@
-- name: "reload health-nginx.cymais.service"
+- name: "reload health-nginx.service"
   systemd:
-    name: health-nginx.cymais.service
+    name: health-nginx.service
     enabled: yes
     daemon_reload: yes

roles/health-nginx/tasks/main.yml

@@ -17,11 +17,11 @@
     dest: "{{ health_nginx_folder }}health-nginx.py"
   when: run_once_health_nginx is not defined
 
-- name: create health-nginx.cymais.service
+- name: create health-nginx.service
   template: 
     src: health-nginx.service.j2
-    dest: /etc/systemd/system/health-nginx.cymais.service
+    dest: /etc/systemd/system/health-nginx.service
-  notify: reload health-nginx.cymais.service
+  notify: reload health-nginx.service
   when: run_once_health_nginx is not defined
 
 - name: set service_name to the name of the current role

roles/health-nginx/templates/health-nginx.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Check nginx configuration status
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/nginx-certbot/handlers/main.yml

@@ -1,6 +1,6 @@
 - name: "reload certbot service"
   systemd:
-    name: nginx-certbot.cymais.service
+    name: nginx-certbot.service
     state: reloaded
     enabled: yes
     daemon_reload: yes

roles/nginx-certbot/tasks/main.yml

@@ -4,10 +4,10 @@
     state: present
   when: run_once_nginx_certbot is not defined
 
-- name: configure nginx-certbot.cymais.service
+- name: configure nginx-certbot.service
   template: 
     src:  nginx-certbot.service.j2
-    dest: /etc/systemd/system/nginx-certbot.cymais.service
+    dest: /etc/systemd/system/nginx-certbot.service
   notify: reload certbot service
   when: run_once_nginx_certbot is not defined
 

roles/nginx-certbot/templates/nginx-certbot.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Let's Encrypt renewal
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/storage/files/optimize.py

@@ -59,15 +59,15 @@ def has_container_with_database(containers):
 if __name__ == "__main__":
     # Argument parser setup
     parser = argparse.ArgumentParser(description='Migrate Docker volumes to SSD or HDD based on container image.')
-    parser.add_argument('--rapid-storage-path', type=str, required=True, help='Path to the SSD storage')
+    parser.add_argument('--ssd_path', type=str, required=True, help='Path to the SSD storage')
-    parser.add_argument('--mass-storage-path', type=str, required=True, help='Path to the HDD storage')
+    parser.add_argument('--hdd_path', type=str, required=True, help='Path to the HDD storage')
     
     # Parse arguments
     args = parser.parse_args()
 
     # Set paths from arguments
-    rapid_storage_path = args.rapid_storage_path
+    ssd_path = args.ssd_path
-    mass_storage_path = args.mass_storage_path
+    hdd_path = args.hdd_path
 
     # List all Docker volumes
     volumes = run_command("docker volume ls -q").splitlines()
@@ -79,10 +79,10 @@ if __name__ == "__main__":
             print(f"Skipped Volume {volume}. The storage path {volume_path} is a symbolic link.")
         elif has_container_with_database(containers):
             print(f"Safing volume {volume} on SSD.")
-            pause_and_move(rapid_storage_path, volume, volume_path, containers)
+            pause_and_move(ssd_path, volume, volume_path, containers)
         else:
             print(f"Safing volume {volume} on HDD.")
-            pause_and_move(mass_storage_path, volume, volume_path, containers)
+            pause_and_move(hdd_path, volume, volume_path, containers)
 
     print("Operation completed.")
     

roles/systemd-notifier-email/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: "restart systemd-notifier-email service"
   systemd:
-    name: systemd-notifier-email.cymais.service
+    name: systemd-notifier-email.service
     daemon_reload: yes

roles/systemd-notifier-email/tasks/main.yml

@@ -3,9 +3,7 @@
   when: run_once_systemd_notifier_email is not defined
 
 - name: configure msmtprc.conf.j2
-  template:
+  template: src=msmtprc.conf.j2 dest=/root/.msmtprc
-    src:  "msmtprc.conf.j2"
-    dest: "/root/.msmtprc"
   when: run_once_systemd_notifier_email is not defined
 
 - name: "create {{systemd_notifier_email_folder}}"
@@ -16,15 +14,11 @@
   when: run_once_systemd_notifier_email is not defined
 
 - name: configure systemd-notifier-email.sh
-  template:
+  template: src=systemd-notifier-email.sh.j2 dest={{systemd_notifier_email_folder}}systemd-notifier-email.sh
-    src:  systemd-notifier-email.sh.j2 
-    dest: "{{systemd_notifier_email_folder}}systemd-notifier-email.sh"
   when: run_once_systemd_notifier_email is not defined
 
-- name: configure systemd-notifier-email.cymais.service
+- name: configure systemd-notifier-email.service
-  template: 
+  template: src=systemd-notifier-email@.service.j2 dest=/etc/systemd/system/systemd-notifier-email@.service
-    src:  systemd-notifier-email@.service.j2
-    dest: /etc/systemd/system/systemd-notifier-email.cymais@.service
   notify: restart systemd-notifier-email service
   when: run_once_systemd_notifier_email is not defined
 

roles/systemd-notifier-telegram/handlers/main.yml

@@ -1,4 +1,4 @@
 - name: "restart systemd-notifier-telegram service"
   systemd:
-    name: systemd-notifier-telegram.cymais.service
+    name: systemd-notifier-telegram.service
     daemon_reload: yes

roles/systemd-notifier-telegram/tasks/main.yml

@@ -17,10 +17,10 @@
     dest: "{{ systemd_telegram_script }}"
   when: run_once_systemd_notifier_telegram is not defined  
 
-- name: configure systemd-notifier-telegram.cymais.service
+- name: configure systemd-notifier-telegram.service
   template: 
     src: systemd-notifier-telegram@.service.j2 
-    dest: "/etc/systemd/system/systemd-notifier-telegram.cymais@.service"
+    dest: "/etc/systemd/system/systemd-notifier-telegram@.service"
   notify: "restart systemd-notifier-telegram service"
   when: run_once_systemd_notifier_telegram is not defined
 

roles/systemd-notifier/handlers/main.yml

@@ -1,6 +1,6 @@
 - name: "restart systemd-notifier service"
   systemd:
-    name: systemd-notifier.cymais.service
+    name: systemd-notifier.service
     daemon_reload: yes
   when: run_once_systemd_notifier_service is not defined
 

roles/systemd-notifier/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
-- name: configure systemd-notifier.cymais@.service
+- name: configure systemd-notifier@.service
   template: 
     src: systemd-notifier@.service.j2 
-    dest: "/etc/systemd/system/systemd-notifier.cymais@.service"
+    dest: "/etc/systemd/system/systemd-notifier@.service"
   notify: "restart systemd-notifier service"
   when: run_once_systemd_notifier_service is not defined
 

roles/systemd-notifier/templates/systemd-notifier@.service.j2

@@ -3,6 +3,6 @@ Description=Notifier for %i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/systemctl start systemd-notifier-telegram.cymais@%i.service systemd-notifier-email.cymais@%i.service
+ExecStart=/usr/bin/systemctl start systemd-notifier-telegram@%i.service systemd-notifier-email@%i.service
 User=root
 Group=systemd-journal

roles/systemd-timer/handlers/main.yml

@@ -1,6 +1,6 @@
 - name: "restart timer"
   systemd:
-    name: "{{service_name}}.cymais.timer"
+    name: "{{service_name}}.timer"
     state: restarted
     enabled: yes
     daemon_reload: yes

roles/systemd-timer/tasks/main.yml

@@ -1,7 +1,7 @@
-- name: create {{service_name}}.cymais.timer
+- name: create {{service_name}}.timer
   template:
     src: dummy.timer.j2
-    dest: "/etc/systemd/system/{{service_name}}.cymais.timer"
+    dest: "/etc/systemd/system/{{service_name}}.timer"
   register: dummy_timer
   changed_when: dummy_timer.changed or activate_all_timers | bool
   notify: restart timer

roles/systemd-timer/templates/dummy.timer.j2

@@ -1,5 +1,5 @@
 [Unit]
-Description=Timer to start {{service_name}}.cymais.service
+Description=Timer to start {{service_name}}.service
 
 [Timer]
 OnCalendar={{on_calendar}}

roles/update-docker/tasks/main.yml

@@ -1,6 +1,6 @@
-- name: "start backup-docker-to-local-everything.cymais.service"
+- name: "start backup-docker-to-local-everything.service"
   systemd:
-    name: backup-docker-to-local-everything.cymais.service
+    name: backup-docker-to-local-everything.service
     state: started
   when: mode_backup | bool
 
@@ -9,14 +9,14 @@
     src: update-docker.py
     dest: "{{update_docker_script}}"
 
-- name: configure update-docker.cymais.service
+- name: configure update-docker.service
   template: 
     src: update-docker.service.j2
-    dest: /etc/systemd/system/update-docker.cymais.service
+    dest: /etc/systemd/system/update-docker.service
 
-- name: "reload update-docker.cymais.service"
+- name: "reload update-docker.service"
   systemd:
-    name: update-docker.cymais.service
+    name: update-docker.service
     state: reloaded
     enabled: yes
     daemon_reload: yes

roles/update-docker/templates/update-docker.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=Updates Docker Instances
-OnFailure=systemd-notifier.cymais@%n.service
+OnFailure=systemd-notifier@%n.service
 
 [Service]
 Type=oneshot

roles/wireguard/README.md

@@ -19,12 +19,12 @@ Manages wireguard on host.
 ### Activate Configuration
 ```bash
   cp /path/to/wg0.conf /etc/wireguard/wg0.conf
-  systemctl enable wg-quick@wg0.cymais.service --now
+  systemctl enable wg-quick@wg0.service --now
 ```
 
 ### Check status
 ```bash
-  systemctl status wg-quick@wg0.cymais.service
+  systemctl status wg-quick@wg0.service
 ```
 
 ## See

roles/wireguard/handlers/main.yml

@@ -1,6 +1,6 @@
 - name: "restart wireguard"
   systemd:
-    name: wg-quick.cymais@wg0.service
+    name: wg-quick@wg0.service
     state: restarted
     enabled: yes
     daemon_reload: yes