diff --git a/docs/guides/administrator/Readme.md b/docs/guides/administrator/Readme.md index 44437e10..16e9d4e6 100644 --- a/docs/guides/administrator/Readme.md +++ b/docs/guides/administrator/Readme.md @@ -17,6 +17,6 @@ Follow these guides to install and configure CyMaIS: ## Managing & Updating CyMaIS 🔄 - Regularly update services using `update-docker`, `update-pacman`, or `update-apt`. - Monitor system health with `mon-bot-btrfs`, `mon-bot-webserver`, and `mon-bot-docker-container`. -- Automate system maintenance with `maintenance-lock`, `cleanup-backups-service`, and `maintenance-docker-restart`. +- Automate system maintenance with `maint-lock`, `cleanup-backups-service`, and `maint-docker-restart`. For more details, refer to the specific guides above. \ No newline at end of file diff --git a/group_vars/all/05_maintenace.yml b/group_vars/all/05_maintenace.yml index 54e7e0c7..8dd19dac 100644 --- a/group_vars/all/05_maintenace.yml +++ b/group_vars/all/05_maintenace.yml @@ -26,10 +26,10 @@ system_maintenance_cleanup_services: ### Services that Manipulate the System system_maintenance_manipulation_services: - - "maintenance-docker-heal" + - "maint-docker-heal" - "update-docker" - - "maintenance-docker-storage-optimizer" - - "maintenance-docker-restart" + - "maint-docker-storage-optimizer" + - "maint-docker-restart" ## Total System Maintenance Services system_maintenance_services: "{{ system_maintenance_backup_services + system_maintenance_cleanup_services + system_maintenance_manipulation_services }}" diff --git a/group_vars/all/07_paths.yml b/group_vars/all/07_paths.yml index bbda1b19..4b6f2b8b 100644 --- a/group_vars/all/07_paths.yml +++ b/group_vars/all/07_paths.yml @@ -3,4 +3,4 @@ path_administrator_home: "/home/administrator/" path_administrator_scripts: "/opt/scripts/" path_docker_compose_instances: "/opt/docker/" -path_system_lock_script: "/opt/scripts/maintenance-lock.py" \ No newline at end of file +path_system_lock_script: "/opt/scripts/maint-lock.py" \ No newline at end of file diff --git a/roles/README.md b/roles/README.md index 0a6e9b7a..873d2331 100644 --- a/roles/README.md +++ b/roles/README.md @@ -72,10 +72,10 @@ For a complete list of role categories and detailed definitions, see: ## Maintenance & Healing -- **maintenance-*** +- **maint-*** Periodic maintenance tasks (Btrfs balancing, swapfile management). -- **maintenance-docker-*** +- **maint-docker-*** Automated recovery and restarts for Docker Compose workloads. - **cleanup-*** @@ -112,7 +112,7 @@ For a complete list of role categories and detailed definitions, see: > **Tip:** To find a role quickly, search for its prefix: > `core-`, `generic-`, `desk-`, `webserver-`, `web-service-`, `web-app-`, -> `network-`, `service-`, `monitor-`, `alert-`, `maintenance-`, `cleanup-`, +> `network-`, `service-`, `monitor-`, `alert-`, `maint-`, `cleanup-`, > `backup-`, `update-`, `pkgmgr-`, `user-`. --- diff --git a/roles/backup-data-to-usb/meta/main.yml b/roles/backup-data-to-usb/meta/main.yml index 0f94c95b..7414234b 100644 --- a/roles/backup-data-to-usb/meta/main.yml +++ b/roles/backup-data-to-usb/meta/main.yml @@ -24,4 +24,4 @@ galaxy_info: documentation: https://s.veen.world/cymais dependencies: - cleanup-backups-service - - maintenance-lock + - maint-lock diff --git a/roles/backup-docker-to-local/README.md b/roles/backup-docker-to-local/README.md index dd4d80a4..a5606c18 100644 --- a/roles/backup-docker-to-local/README.md +++ b/roles/backup-docker-to-local/README.md @@ -11,7 +11,7 @@ Optimized for Archlinux, this role ensures that Docker volume backups are perfor - [cleanup-failed-docker-backups](../cleanup-failed-docker-backups/) – Cleans up unsuccessful backup attempts. - [generic-timer](../generic-timer/) – Schedules recurring backup tasks. - [backup-provider](../backup-provider/) – Manages backup sources. -- [maintenance-lock](../maintenance-lock/) – Ensures coordinated maintenance operations. +- [maint-lock](../maint-lock/) – Ensures coordinated maintenance operations. ## Purpose diff --git a/roles/backup-docker-to-local/meta/main.yml b/roles/backup-docker-to-local/meta/main.yml index d1ada20c..90f06b9d 100644 --- a/roles/backup-docker-to-local/meta/main.yml +++ b/roles/backup-docker-to-local/meta/main.yml @@ -26,5 +26,5 @@ dependencies: - backup-provider - alert-compose - cleanup-failed-docker-backups - - maintenance-lock + - maint-lock - backup-directory-validator \ No newline at end of file diff --git a/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 b/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 index 886bc34d..f8879517 100644 --- a/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 +++ b/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 @@ -6,4 +6,4 @@ OnFailure=alert-compose.cymais@%n.service cleanup-failed-docker-backups.cymais.s Type=oneshot ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{ system_maintenance_backup_services | reject('equalto', 'backup-docker-to-local') | join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"' ExecStart=/bin/sh -c '/usr/bin/python {{backup_docker_to_local_folder}}backup-docker-to-local.py --compose-dir {{path_docker_compose_instances}} --everything' -ExecStartPost=/bin/sh -c '/bin/systemctl start maintenance-docker-heal.cymais.service &' \ No newline at end of file +ExecStartPost=/bin/sh -c '/bin/systemctl start maint-docker-heal.cymais.service &' \ No newline at end of file diff --git a/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 b/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 index ad39cef1..1ecabb71 100644 --- a/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 +++ b/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 @@ -6,4 +6,4 @@ OnFailure=alert-compose.cymais@%n.service cleanup-failed-docker-backups.cymais.s Type=oneshot ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{ system_maintenance_backup_services | reject('equalto', 'backup-docker-to-local-everything') | join(' ') }} --timeout "{{system_maintenance_lock_timeout_backup_services}}"' ExecStart=/bin/sh -c '/usr/bin/python {{backup_docker_to_local_folder}}backup-docker-to-local.py --compose-dir {{path_docker_compose_instances}}' -ExecStartPost=/bin/sh -c '/bin/systemctl start maintenance-docker-heal.cymais.service &' \ No newline at end of file +ExecStartPost=/bin/sh -c '/bin/systemctl start maint-docker-heal.cymais.service &' \ No newline at end of file diff --git a/roles/backup-remote-to-local/README.md b/roles/backup-remote-to-local/README.md index a625050e..5de69f05 100644 --- a/roles/backup-remote-to-local/README.md +++ b/roles/backup-remote-to-local/README.md @@ -17,7 +17,7 @@ Backup Remote to Local is a robust solution for retrieving backup data from remo - **Remote Backup Retrieval:** Pulls backups from a remote server using secure SSH connections. - **Incremental Backup with rsync:** Uses rsync with options for archive, backup, and hard linking to efficiently manage changes. - **Retry Logic:** Implements a retry mechanism to handle transient network issues or remote errors. -- **Integration with Other Roles:** Works alongside roles like backup-directory-validator, cleanup-failed-docker-backups, generic-timer, backup-provider, and maintenance-lock. +- **Integration with Other Roles:** Works alongside roles like backup-directory-validator, cleanup-failed-docker-backups, generic-timer, backup-provider, and maint-lock. - **Administrative Debugging:** Detailed debug instructions and administrative tasks are provided in a separate file. ## Other Resources diff --git a/roles/backup-remote-to-local/meta/main.yml b/roles/backup-remote-to-local/meta/main.yml index 2d3d3ade..f162066e 100644 --- a/roles/backup-remote-to-local/meta/main.yml +++ b/roles/backup-remote-to-local/meta/main.yml @@ -29,5 +29,5 @@ dependencies: - alert-compose - cleanup-backups-timer - cleanup-failed-docker-backups - - maintenance-lock + - maint-lock - user-root diff --git a/roles/cleanup-backups-service/meta/main.yml b/roles/cleanup-backups-service/meta/main.yml index faed4821..4ee195f8 100644 --- a/roles/cleanup-backups-service/meta/main.yml +++ b/roles/cleanup-backups-service/meta/main.yml @@ -24,4 +24,4 @@ galaxy_info: dependencies: - generic-python-pip - alert-compose - - maintenance-lock + - maint-lock diff --git a/roles/cleanup-disc-space/meta/main.yml b/roles/cleanup-disc-space/meta/main.yml index d59e9ec6..9c72ffb2 100644 --- a/roles/cleanup-disc-space/meta/main.yml +++ b/roles/cleanup-disc-space/meta/main.yml @@ -23,4 +23,4 @@ galaxy_info: documentation: "https://s.veen.world/cymais" dependencies: - alert-compose - - maintenance-lock + - maint-lock diff --git a/roles/cleanup-failed-docker-backups/meta/main.yml b/roles/cleanup-failed-docker-backups/meta/main.yml index 51e1ca38..eaa442fa 100644 --- a/roles/cleanup-failed-docker-backups/meta/main.yml +++ b/roles/cleanup-failed-docker-backups/meta/main.yml @@ -23,5 +23,5 @@ galaxy_info: documentation: "https://s.veen.world/cymais" dependencies: - alert-compose - - maintenance-lock + - maint-lock - backup-directory-validator diff --git a/roles/docker/meta/main.yml b/roles/docker/meta/main.yml index 7f86b3cd..effc5034 100644 --- a/roles/docker/meta/main.yml +++ b/roles/docker/meta/main.yml @@ -31,5 +31,5 @@ dependencies: - user-administrator - mon-bot-docker-container - mon-bot-docker-volumes - - maintenance-docker-heal - - maintenance-docker-restart + - maint-docker-heal + - maint-docker-restart diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index e1058594..9140a458 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -16,7 +16,7 @@ group: administrator when: run_once_docker is not defined -- name: Set docker_enabled to true, to activate maintenance-docker-storage-optimizer +- name: Set docker_enabled to true, to activate maint-docker-storage-optimizer set_fact: docker_enabled: true when: run_once_docker is not defined diff --git a/roles/maintenance-btrfs-auto-balancer/README.md b/roles/maint-btrfs-auto-balancer/README.md similarity index 100% rename from roles/maintenance-btrfs-auto-balancer/README.md rename to roles/maint-btrfs-auto-balancer/README.md diff --git a/roles/maint-btrfs-auto-balancer/handlers/main.yml b/roles/maint-btrfs-auto-balancer/handlers/main.yml new file mode 100644 index 00000000..bca0a726 --- /dev/null +++ b/roles/maint-btrfs-auto-balancer/handlers/main.yml @@ -0,0 +1,4 @@ +- name: "reload maint-btrfs-auto-balancer.cymais.service" + systemd: + name: maint-btrfs-auto-balancer.cymais.service + daemon_reload: yes \ No newline at end of file diff --git a/roles/maintenance-btrfs-auto-balancer/meta/main.yml b/roles/maint-btrfs-auto-balancer/meta/main.yml similarity index 100% rename from roles/maintenance-btrfs-auto-balancer/meta/main.yml rename to roles/maint-btrfs-auto-balancer/meta/main.yml diff --git a/roles/maintenance-btrfs-auto-balancer/tasks/main.yml b/roles/maint-btrfs-auto-balancer/tasks/main.yml similarity index 75% rename from roles/maintenance-btrfs-auto-balancer/tasks/main.yml rename to roles/maint-btrfs-auto-balancer/tasks/main.yml index 2ca19105..8a979434 100644 --- a/roles/maintenance-btrfs-auto-balancer/tasks/main.yml +++ b/roles/maint-btrfs-auto-balancer/tasks/main.yml @@ -5,11 +5,11 @@ package_name: btrfs-auto-balancer when: run_once_system_btrfs_auto_balancer is not defined -- name: configure maintenance-btrfs-auto-balancer.cymais.service +- name: configure maint-btrfs-auto-balancer.cymais.service template: - src: maintenance-btrfs-auto-balancer.service.j2 - dest: /etc/systemd/system/maintenance-btrfs-auto-balancer.cymais.service - notify: reload maintenance-btrfs-auto-balancer.cymais.service + src: maint-btrfs-auto-balancer.service.j2 + dest: /etc/systemd/system/maint-btrfs-auto-balancer.cymais.service + notify: reload maint-btrfs-auto-balancer.cymais.service when: run_once_system_btrfs_auto_balancer is not defined - name: set service_name to the name of the current role diff --git a/roles/maintenance-btrfs-auto-balancer/templates/maintenance-btrfs-auto-balancer.service.j2 b/roles/maint-btrfs-auto-balancer/templates/maint-btrfs-auto-balancer.service.j2 similarity index 100% rename from roles/maintenance-btrfs-auto-balancer/templates/maintenance-btrfs-auto-balancer.service.j2 rename to roles/maint-btrfs-auto-balancer/templates/maint-btrfs-auto-balancer.service.j2 diff --git a/roles/maintenance-btrfs-auto-balancer/vars/main.yml b/roles/maint-btrfs-auto-balancer/vars/main.yml similarity index 100% rename from roles/maintenance-btrfs-auto-balancer/vars/main.yml rename to roles/maint-btrfs-auto-balancer/vars/main.yml diff --git a/roles/maintenance-docker-heal/README.md b/roles/maint-docker-heal/README.md similarity index 100% rename from roles/maintenance-docker-heal/README.md rename to roles/maint-docker-heal/README.md diff --git a/roles/maintenance-docker-heal/files/maintenance-docker-heal.py b/roles/maint-docker-heal/files/maint-docker-heal.py similarity index 100% rename from roles/maintenance-docker-heal/files/maintenance-docker-heal.py rename to roles/maint-docker-heal/files/maint-docker-heal.py diff --git a/roles/maint-docker-heal/handlers/main.yml b/roles/maint-docker-heal/handlers/main.yml new file mode 100644 index 00000000..b5446269 --- /dev/null +++ b/roles/maint-docker-heal/handlers/main.yml @@ -0,0 +1,5 @@ +- name: restart maint-docker-heal.cymais.service + systemd: + name: maint-docker-heal.cymais.service + state: restarted + daemon_reload: yes diff --git a/roles/maintenance-docker-heal/meta/main.yml b/roles/maint-docker-heal/meta/main.yml similarity index 97% rename from roles/maintenance-docker-heal/meta/main.yml rename to roles/maint-docker-heal/meta/main.yml index 5703a745..bbe6f60b 100644 --- a/roles/maintenance-docker-heal/meta/main.yml +++ b/roles/maint-docker-heal/meta/main.yml @@ -23,4 +23,4 @@ galaxy_info: issue_tracker_url: https://s.veen.world/cymaisissues documentation: https://s.veen.world/cymais dependencies: - - maintenance-lock \ No newline at end of file + - maint-lock \ No newline at end of file diff --git a/roles/maintenance-docker-heal/tasks/main.yml b/roles/maint-docker-heal/tasks/main.yml similarity index 64% rename from roles/maintenance-docker-heal/tasks/main.yml rename to roles/maint-docker-heal/tasks/main.yml index 7b2c4abf..acd37270 100644 --- a/roles/maintenance-docker-heal/tasks/main.yml +++ b/roles/maint-docker-heal/tasks/main.yml @@ -5,18 +5,18 @@ mode: 0755 when: run_once_heal_docker is not defined -- name: create maintenance-docker-heal.py +- name: create maint-docker-heal.py copy: - src: maintenance-docker-heal.py - dest: "{{heal_docker}}maintenance-docker-heal.py" - notify: restart maintenance-docker-heal.cymais.service + src: maint-docker-heal.py + dest: "{{heal_docker}}maint-docker-heal.py" + notify: restart maint-docker-heal.cymais.service when: run_once_heal_docker is not defined -- name: create maintenance-docker-heal.cymais.service +- name: create maint-docker-heal.cymais.service template: - src: maintenance-docker-heal.service.j2 - dest: /etc/systemd/system/maintenance-docker-heal.cymais.service - notify: restart maintenance-docker-heal.cymais.service + src: maint-docker-heal.service.j2 + dest: /etc/systemd/system/maint-docker-heal.cymais.service + notify: restart maint-docker-heal.cymais.service when: run_once_heal_docker is not defined - name: set service_name to the name of the current role diff --git a/roles/maintenance-docker-heal/templates/maintenance-docker-heal.service.j2 b/roles/maint-docker-heal/templates/maint-docker-heal.service.j2 similarity index 50% rename from roles/maintenance-docker-heal/templates/maintenance-docker-heal.service.j2 rename to roles/maint-docker-heal/templates/maint-docker-heal.service.j2 index fa5c32b6..37351ffb 100644 --- a/roles/maintenance-docker-heal/templates/maintenance-docker-heal.service.j2 +++ b/roles/maint-docker-heal/templates/maint-docker-heal.service.j2 @@ -4,5 +4,5 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{system_maintenance_cleanup_services| join(' ') }} maintenance-docker-heal --timeout "{{system_maintenance_lock_timeout_heal_docker}}"' -ExecStart=/bin/sh -c '/bin/python {{heal_docker}}maintenance-docker-heal.py {{path_docker_compose_instances}}' \ No newline at end of file +ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{system_maintenance_cleanup_services| join(' ') }} maint-docker-heal --timeout "{{system_maintenance_lock_timeout_heal_docker}}"' +ExecStart=/bin/sh -c '/bin/python {{heal_docker}}maint-docker-heal.py {{path_docker_compose_instances}}' \ No newline at end of file diff --git a/roles/maint-docker-heal/vars/main.yml b/roles/maint-docker-heal/vars/main.yml new file mode 100644 index 00000000..38804d8b --- /dev/null +++ b/roles/maint-docker-heal/vars/main.yml @@ -0,0 +1 @@ +heal_docker: "{{path_administrator_scripts}}maint-docker-heal/" \ No newline at end of file diff --git a/roles/maintenance-docker-restart/README.md b/roles/maint-docker-restart/README.md similarity index 100% rename from roles/maintenance-docker-restart/README.md rename to roles/maint-docker-restart/README.md diff --git a/roles/maintenance-docker-restart/files/maintenance-docker-restart.py b/roles/maint-docker-restart/files/maint-docker-restart.py similarity index 100% rename from roles/maintenance-docker-restart/files/maintenance-docker-restart.py rename to roles/maint-docker-restart/files/maint-docker-restart.py diff --git a/roles/maint-docker-restart/handlers/main.yml b/roles/maint-docker-restart/handlers/main.yml new file mode 100644 index 00000000..1255c791 --- /dev/null +++ b/roles/maint-docker-restart/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload maint-docker-restart.cymais.service" + systemd: + name: maint-docker-restart.cymais.service + enabled: yes + daemon_reload: yes diff --git a/roles/maintenance-docker-restart/meta/main.yml b/roles/maint-docker-restart/meta/main.yml similarity index 97% rename from roles/maintenance-docker-restart/meta/main.yml rename to roles/maint-docker-restart/meta/main.yml index bc4e374f..6f8927e8 100644 --- a/roles/maintenance-docker-restart/meta/main.yml +++ b/roles/maint-docker-restart/meta/main.yml @@ -26,4 +26,4 @@ galaxy_info: issue_tracker_url: "https://s.veen.world/cymaisissues" documentation: "https://s.veen.world/cymais" dependencies: - - maintenance-lock \ No newline at end of file + - maint-lock \ No newline at end of file diff --git a/roles/maintenance-docker-restart/tasks/main.yml b/roles/maint-docker-restart/tasks/main.yml similarity index 70% rename from roles/maintenance-docker-restart/tasks/main.yml rename to roles/maint-docker-restart/tasks/main.yml index 4213cd10..928eb24d 100644 --- a/roles/maintenance-docker-restart/tasks/main.yml +++ b/roles/maint-docker-restart/tasks/main.yml @@ -7,14 +7,14 @@ - name: create {{restart_docker_script}} copy: - src: maintenance-docker-restart.py + src: maint-docker-restart.py dest: "{{restart_docker_script}}" - - name: configure maintenance-docker-restart.cymais.service + - name: configure maint-docker-restart.cymais.service template: - src: maintenance-docker-restart.service.j2 - dest: /etc/systemd/system/maintenance-docker-restart.cymais.service - notify: "reload maintenance-docker-restart.cymais.service" + src: maint-docker-restart.service.j2 + dest: /etc/systemd/system/maint-docker-restart.cymais.service + notify: "reload maint-docker-restart.cymais.service" - name: set service_name to the name of the current role set_fact: diff --git a/roles/maintenance-docker-restart/templates/maintenance-docker-restart.service.j2 b/roles/maint-docker-restart/templates/maint-docker-restart.service.j2 similarity index 70% rename from roles/maintenance-docker-restart/templates/maintenance-docker-restart.service.j2 rename to roles/maint-docker-restart/templates/maint-docker-restart.service.j2 index fb4cc579..6bbe66a9 100644 --- a/roles/maintenance-docker-restart/templates/maintenance-docker-restart.service.j2 +++ b/roles/maint-docker-restart/templates/maint-docker-restart.service.j2 @@ -4,5 +4,5 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{system_maintenance_cleanup_services | join(' ') }} maintenance-docker-restart --timeout "{{system_maintenance_lock_timeout_restart_docker}}"' +ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{system_maintenance_cleanup_services | join(' ') }} maint-docker-restart --timeout "{{system_maintenance_lock_timeout_restart_docker}}"' ExecStart=/bin/sh -c '/usr/bin/python {{restart_docker_script}} {{path_docker_compose_instances}}' \ No newline at end of file diff --git a/roles/maint-docker-restart/vars/main.yml b/roles/maint-docker-restart/vars/main.yml new file mode 100644 index 00000000..cf48eb5f --- /dev/null +++ b/roles/maint-docker-restart/vars/main.yml @@ -0,0 +1,2 @@ +restart_docker_folder: "{{path_administrator_scripts}}maint-docker-restart/" +restart_docker_script: "{{restart_docker_folder}}maint-docker-restart.py" \ No newline at end of file diff --git a/roles/maintenance-docker-storage-optimizer/README.md b/roles/maint-docker-storage-optimizer/README.md similarity index 100% rename from roles/maintenance-docker-storage-optimizer/README.md rename to roles/maint-docker-storage-optimizer/README.md diff --git a/roles/maintenance-docker-storage-optimizer/files/__init__.py b/roles/maint-docker-storage-optimizer/files/__init__.py similarity index 100% rename from roles/maintenance-docker-storage-optimizer/files/__init__.py rename to roles/maint-docker-storage-optimizer/files/__init__.py diff --git a/roles/maintenance-docker-storage-optimizer/files/maintenance-docker-storage-optimizer.py b/roles/maint-docker-storage-optimizer/files/maint-docker-storage-optimizer.py similarity index 100% rename from roles/maintenance-docker-storage-optimizer/files/maintenance-docker-storage-optimizer.py rename to roles/maint-docker-storage-optimizer/files/maint-docker-storage-optimizer.py diff --git a/roles/maint-docker-storage-optimizer/handlers/main.yml b/roles/maint-docker-storage-optimizer/handlers/main.yml new file mode 100644 index 00000000..e0523f0b --- /dev/null +++ b/roles/maint-docker-storage-optimizer/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload maint-docker-storage-optimizer.cymais.service" + systemd: + name: maint-docker-storage-optimizer.cymais.service + state: reloaded + daemon_reload: yes diff --git a/roles/maintenance-docker-storage-optimizer/meta/main.yml b/roles/maint-docker-storage-optimizer/meta/main.yml similarity index 100% rename from roles/maintenance-docker-storage-optimizer/meta/main.yml rename to roles/maint-docker-storage-optimizer/meta/main.yml diff --git a/roles/maint-docker-storage-optimizer/tasks/main.yml b/roles/maint-docker-storage-optimizer/tasks/main.yml new file mode 100644 index 00000000..94280498 --- /dev/null +++ b/roles/maint-docker-storage-optimizer/tasks/main.yml @@ -0,0 +1,22 @@ +- name: "create {{storage_optimizer_directory}}" + file: + path: "{{storage_optimizer_directory}}" + state: directory + mode: 0755 + +- name: create maint-docker-storage-optimizer.cymais.service + template: + src: maint-docker-storage-optimizer.service.j2 + dest: /etc/systemd/system/maint-docker-storage-optimizer.cymais.service + notify: reload maint-docker-storage-optimizer.cymais.service + +- name: create maint-docker-storage-optimizer.py + copy: + src: maint-docker-storage-optimizer.py + dest: "{{storage_optimizer_script}}" + mode: 0755 + +- name: "optimize storage performance" + systemd: + name: maint-docker-storage-optimizer.cymais.service + state: started \ No newline at end of file diff --git a/roles/maintenance-docker-storage-optimizer/templates/maintenance-docker-storage-optimizer.service.j2 b/roles/maint-docker-storage-optimizer/templates/maint-docker-storage-optimizer.service.j2 similarity index 75% rename from roles/maintenance-docker-storage-optimizer/templates/maintenance-docker-storage-optimizer.service.j2 rename to roles/maint-docker-storage-optimizer/templates/maint-docker-storage-optimizer.service.j2 index a159aef1..e71ccf51 100644 --- a/roles/maintenance-docker-storage-optimizer/templates/maintenance-docker-storage-optimizer.service.j2 +++ b/roles/maint-docker-storage-optimizer/templates/maint-docker-storage-optimizer.service.j2 @@ -4,5 +4,5 @@ OnFailure=alert-compose.cymais@%n.service [Service] Type=oneshot -ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore maintenance-docker-storage-optimizer backup-remote-to-local --timeout "{{system_maintenance_lock_timeout_storage_optimizer}}"' +ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore maint-docker-storage-optimizer backup-remote-to-local --timeout "{{system_maintenance_lock_timeout_storage_optimizer}}"' ExecStart=/bin/sh -c '/usr/bin/python {{storage_optimizer_script}} --rapid-storage-path {{path_rapid_storage}} --mass-storage-path {{path_mass_storage}}' \ No newline at end of file diff --git a/roles/maintenance-docker-storage-optimizer/vars/main.yml b/roles/maint-docker-storage-optimizer/vars/main.yml similarity index 64% rename from roles/maintenance-docker-storage-optimizer/vars/main.yml rename to roles/maint-docker-storage-optimizer/vars/main.yml index c4a8869b..eb776544 100644 --- a/roles/maintenance-docker-storage-optimizer/vars/main.yml +++ b/roles/maint-docker-storage-optimizer/vars/main.yml @@ -1,2 +1,2 @@ -storage_optimizer_directory: "{{path_administrator_scripts}}maintenance-docker-storage-optimizer/" -storage_optimizer_script: "{{storage_optimizer_directory}}maintenance-docker-storage-optimizer.py" \ No newline at end of file +storage_optimizer_directory: "{{path_administrator_scripts}}maint-docker-storage-optimizer/" +storage_optimizer_script: "{{storage_optimizer_directory}}maint-docker-storage-optimizer.py" \ No newline at end of file diff --git a/roles/maintenance-lock/README.md b/roles/maint-lock/README.md similarity index 100% rename from roles/maintenance-lock/README.md rename to roles/maint-lock/README.md diff --git a/roles/maintenance-lock/files/maintenance-lock.py b/roles/maint-lock/files/maint-lock.py similarity index 100% rename from roles/maintenance-lock/files/maintenance-lock.py rename to roles/maint-lock/files/maint-lock.py diff --git a/roles/maintenance-lock/meta/main.yml b/roles/maint-lock/meta/main.yml similarity index 100% rename from roles/maintenance-lock/meta/main.yml rename to roles/maint-lock/meta/main.yml diff --git a/roles/maintenance-lock/tasks/main.yml b/roles/maint-lock/tasks/main.yml similarity index 92% rename from roles/maintenance-lock/tasks/main.yml rename to roles/maint-lock/tasks/main.yml index 9ffde1f6..efdebe3a 100644 --- a/roles/maintenance-lock/tasks/main.yml +++ b/roles/maint-lock/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: create {{path_system_lock_script}} copy: - src: maintenance-lock.py + src: maint-lock.py dest: "{{path_system_lock_script}}" when: run_once_system_maintenance_lock is not defined diff --git a/roles/maintenance-swapfile/README.md b/roles/maint-swapfile/README.md similarity index 100% rename from roles/maintenance-swapfile/README.md rename to roles/maint-swapfile/README.md diff --git a/roles/maintenance-swapfile/tasks/main.yml b/roles/maint-swapfile/tasks/main.yml similarity index 100% rename from roles/maintenance-swapfile/tasks/main.yml rename to roles/maint-swapfile/tasks/main.yml diff --git a/roles/maintenance-btrfs-auto-balancer/handlers/main.yml b/roles/maintenance-btrfs-auto-balancer/handlers/main.yml deleted file mode 100644 index 11b595c9..00000000 --- a/roles/maintenance-btrfs-auto-balancer/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: "reload maintenance-btrfs-auto-balancer.cymais.service" - systemd: - name: maintenance-btrfs-auto-balancer.cymais.service - daemon_reload: yes \ No newline at end of file diff --git a/roles/maintenance-docker-heal/handlers/main.yml b/roles/maintenance-docker-heal/handlers/main.yml deleted file mode 100644 index 322c4e06..00000000 --- a/roles/maintenance-docker-heal/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: restart maintenance-docker-heal.cymais.service - systemd: - name: maintenance-docker-heal.cymais.service - state: restarted - daemon_reload: yes diff --git a/roles/maintenance-docker-heal/vars/main.yml b/roles/maintenance-docker-heal/vars/main.yml deleted file mode 100644 index f6ed3cdb..00000000 --- a/roles/maintenance-docker-heal/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -heal_docker: "{{path_administrator_scripts}}maintenance-docker-heal/" \ No newline at end of file diff --git a/roles/maintenance-docker-restart/handlers/main.yml b/roles/maintenance-docker-restart/handlers/main.yml deleted file mode 100644 index 0eb30235..00000000 --- a/roles/maintenance-docker-restart/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload maintenance-docker-restart.cymais.service" - systemd: - name: maintenance-docker-restart.cymais.service - enabled: yes - daemon_reload: yes diff --git a/roles/maintenance-docker-restart/vars/main.yml b/roles/maintenance-docker-restart/vars/main.yml deleted file mode 100644 index 87a28a19..00000000 --- a/roles/maintenance-docker-restart/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -restart_docker_folder: "{{path_administrator_scripts}}maintenance-docker-restart/" -restart_docker_script: "{{restart_docker_folder}}maintenance-docker-restart.py" \ No newline at end of file diff --git a/roles/maintenance-docker-storage-optimizer/handlers/main.yml b/roles/maintenance-docker-storage-optimizer/handlers/main.yml deleted file mode 100644 index 0e60bf79..00000000 --- a/roles/maintenance-docker-storage-optimizer/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload maintenance-docker-storage-optimizer.cymais.service" - systemd: - name: maintenance-docker-storage-optimizer.cymais.service - state: reloaded - daemon_reload: yes diff --git a/roles/maintenance-docker-storage-optimizer/tasks/main.yml b/roles/maintenance-docker-storage-optimizer/tasks/main.yml deleted file mode 100644 index a58ba1de..00000000 --- a/roles/maintenance-docker-storage-optimizer/tasks/main.yml +++ /dev/null @@ -1,22 +0,0 @@ -- name: "create {{storage_optimizer_directory}}" - file: - path: "{{storage_optimizer_directory}}" - state: directory - mode: 0755 - -- name: create maintenance-docker-storage-optimizer.cymais.service - template: - src: maintenance-docker-storage-optimizer.service.j2 - dest: /etc/systemd/system/maintenance-docker-storage-optimizer.cymais.service - notify: reload maintenance-docker-storage-optimizer.cymais.service - -- name: create maintenance-docker-storage-optimizer.py - copy: - src: maintenance-docker-storage-optimizer.py - dest: "{{storage_optimizer_script}}" - mode: 0755 - -- name: "optimize storage performance" - systemd: - name: maintenance-docker-storage-optimizer.cymais.service - state: started \ No newline at end of file diff --git a/roles/update-docker/meta/main.yml b/roles/update-docker/meta/main.yml index 02670531..e30b6613 100644 --- a/roles/update-docker/meta/main.yml +++ b/roles/update-docker/meta/main.yml @@ -27,4 +27,4 @@ galaxy_info: issue_tracker_url: "https://s.veen.world/cymaisissues" documentation: "https://s.veen.world/cymais" dependencies: - - maintenance-lock + - maint-lock diff --git a/tasks/plays/01_constructor.yml b/tasks/plays/01_constructor.yml index 7a043bf4..067f60c4 100644 --- a/tasks/plays/01_constructor.yml +++ b/tasks/plays/01_constructor.yml @@ -148,4 +148,4 @@ - name: setup swapfile hosts when: ('swapfile' | application_allowed(group_names, allowed_applications)) include_role: - name: maintenance-swapfile \ No newline at end of file + name: maint-swapfile \ No newline at end of file diff --git a/tasks/plays/02_server.yml b/tasks/plays/02_server.yml index 9c52e193..497a1f3f 100644 --- a/tasks/plays/02_server.yml +++ b/tasks/plays/02_server.yml @@ -9,7 +9,7 @@ - mon-bot-disc-space - cleanup-disc-space - mon-bot-btrfs - - maintenance-btrfs-auto-balancer + - maint-btrfs-auto-balancer - name: "Integrate Docker Role includes" include_tasks: "./tasks/utils/web-app-roles.yml" diff --git a/tasks/plays/03_destructor.yml b/tasks/plays/03_destructor.yml index 78a0715a..49fb70e0 100644 --- a/tasks/plays/03_destructor.yml +++ b/tasks/plays/03_destructor.yml @@ -1,6 +1,6 @@ - name: optimize storage performance include_role: - name: maintenance-docker-storage-optimizer + name: maint-docker-storage-optimizer when: ('storage-optimizer' | application_allowed(group_names, allowed_applications)) - name: Cleanup Docker Anonymous Volumes diff --git a/tests/unit/roles/maintenance-docker-storage-optimizer/__init__.py b/tests/unit/roles/maint-docker-storage-optimizer/__init__.py similarity index 100% rename from tests/unit/roles/maintenance-docker-storage-optimizer/__init__.py rename to tests/unit/roles/maint-docker-storage-optimizer/__init__.py diff --git a/tests/unit/roles/maintenance-docker-storage-optimizer/test_storage_optimizer.py b/tests/unit/roles/maint-docker-storage-optimizer/test_storage_optimizer.py similarity index 94% rename from tests/unit/roles/maintenance-docker-storage-optimizer/test_storage_optimizer.py rename to tests/unit/roles/maint-docker-storage-optimizer/test_storage_optimizer.py index 1c8e5678..82e9efb0 100644 --- a/tests/unit/roles/maintenance-docker-storage-optimizer/test_storage_optimizer.py +++ b/tests/unit/roles/maint-docker-storage-optimizer/test_storage_optimizer.py @@ -8,7 +8,7 @@ import sys def load_optimizer_module(): module_path = os.path.abspath(os.path.join( os.path.dirname(__file__), - '..', "..", "..","..",'roles', 'maintenance-docker-storage-optimizer', 'files', 'maintenance-docker-storage-optimizer.py' + '..', "..", "..","..",'roles', 'maint-docker-storage-optimizer', 'files', 'maint-docker-storage-optimizer.py' )) spec = importlib.util.spec_from_file_location('storage_optimizer', module_path) optimizer = importlib.util.module_from_spec(spec)