From d8f14a9c366f15da6691e78e52304f6d38528cb0 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 10 Jan 2024 11:26:00 +0100 Subject: [PATCH] Changed suffix to .cymais.timer --- roles/backup-remote-to-local/handlers/main.yml | 2 +- roles/driver-msi-keyboard-color/tasks/setup_timers.yml | 8 ++++---- roles/health-docker-container/README.md | 2 +- roles/health-docker-volumes/README.md | 2 +- roles/health-nginx/README.md | 4 ++-- roles/systemd-timer/handlers/main.yml | 2 +- roles/systemd-timer/tasks/main.yml | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/roles/backup-remote-to-local/handlers/main.yml b/roles/backup-remote-to-local/handlers/main.yml index d767c210..9e076b83 100644 --- a/roles/backup-remote-to-local/handlers/main.yml +++ b/roles/backup-remote-to-local/handlers/main.yml @@ -5,7 +5,7 @@ - name: "restart backup-remote-to-local timer" systemd: - name: backup-remote-to-local.timer + name: backup-remote-to-local.cymais.timer state: started enabled: yes daemon_reload: yes diff --git a/roles/driver-msi-keyboard-color/tasks/setup_timers.yml b/roles/driver-msi-keyboard-color/tasks/setup_timers.yml index ed70b212..1be67b04 100644 --- a/roles/driver-msi-keyboard-color/tasks/setup_timers.yml +++ b/roles/driver-msi-keyboard-color/tasks/setup_timers.yml @@ -1,8 +1,8 @@ --- -- name: Copy keyboard-color.timer file +- name: Copy keyboard-color.cymais.timer file template: src: keyboard-color.timer.j2 - dest: /etc/systemd/system/keyboard-color.timer + dest: /etc/systemd/system/keyboard-color.cymais.timer mode: 0644 tags: - keyboard-color @@ -21,9 +21,9 @@ tags: - keyboard-color -- name: Enable and start keyboard-color.timer +- name: Enable and start keyboard-color.cymais.timer systemd: - name: keyboard-color.timer + name: keyboard-color.cymais.timer state: restarted enabled: yes tags: diff --git a/roles/health-docker-container/README.md b/roles/health-docker-container/README.md index 0746b96b..fb11ce48 100644 --- a/roles/health-docker-container/README.md +++ b/roles/health-docker-container/README.md @@ -11,7 +11,7 @@ This Ansible role is designed to ensure the health of Docker containers running - `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.timer.j2`: Systemd timer template. +- `templates/health-docker-container.cymais.timer.j2`: Systemd timer template. - `meta/main.yml`: Meta information declaring dependencies for the role. ## Usage diff --git a/roles/health-docker-volumes/README.md b/roles/health-docker-volumes/README.md index bb29afdc..f705317c 100644 --- a/roles/health-docker-volumes/README.md +++ b/roles/health-docker-volumes/README.md @@ -11,7 +11,7 @@ This role checks for anonymous Docker volumes that are not bound to a container - `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.timer.j2`: Systemd timer template. +- `templates/health-docker-volumes.cymais.timer.j2`: Systemd timer template. - `meta/main.yml`: Meta information declaring dependencies for the role. ## Usage diff --git a/roles/health-nginx/README.md b/roles/health-nginx/README.md index 8ea0a9cd..e47f6ff6 100644 --- a/roles/health-nginx/README.md +++ b/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.timer` are set up to automate the health checks. +3. **Service and Timer Templates**: Templates for `health-nginx.cymais.service` and `health-nginx.cymais.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. -- **restart health-nginx.timer**: Restarts and enables the `health-nginx.timer` to schedule regular health checks. +- **restart health-nginx.cymais.timer**: Restarts and enables the `health-nginx.cymais.timer` to schedule regular health checks. ## Additional Information - For more details on nginx configurations, visit [nginx documentation](https://nginx.org/en/docs/). diff --git a/roles/systemd-timer/handlers/main.yml b/roles/systemd-timer/handlers/main.yml index 0daa96bd..5cbd784b 100644 --- a/roles/systemd-timer/handlers/main.yml +++ b/roles/systemd-timer/handlers/main.yml @@ -1,6 +1,6 @@ - name: "restart timer" systemd: - name: "{{service_name}}.timer" + name: "{{service_name}}.cymais.timer" state: restarted enabled: yes daemon_reload: yes \ No newline at end of file diff --git a/roles/systemd-timer/tasks/main.yml b/roles/systemd-timer/tasks/main.yml index 45123bdf..3d196d7f 100644 --- a/roles/systemd-timer/tasks/main.yml +++ b/roles/systemd-timer/tasks/main.yml @@ -1,7 +1,7 @@ -- name: create {{service_name}}.timer +- name: create {{service_name}}.cymais.timer template: src: dummy.timer.j2 - dest: "/etc/systemd/system/{{service_name}}.timer" + dest: "/etc/systemd/system/{{service_name}}.cymais.timer" register: dummy_timer changed_when: dummy_timer.changed or activate_all_timers | bool notify: restart timer \ No newline at end of file