From e4028fccf4a6e0dff793dc54b201c918ede246c0 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 14 Jul 2025 13:02:06 +0200 Subject: [PATCH] General optimations during inventory cleanup --- docs/analysis/Features.md | 2 +- docs/guides/administrator/Readme.md | 2 +- group_vars/all/05_maintenace.yml | 2 +- roles/{desk-nextcloud-client => desk-nextcloud}/README.md | 0 .../meta/main.yml | 0 .../tasks/main.yml | 0 .../vars/main.yml | 2 +- roles/drv-epson-multiprinter/vars/main.yml | 2 +- roles/drv-intel/vars/main.yml | 2 +- roles/drv-lid-switch/vars/main.yml | 2 +- roles/drv-msi-keyboard-color/vars/main.yml | 2 +- roles/drv-non-free/vars/main.yml | 2 +- .../{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/README.md | 0 .../files/svc-sys-bkp-data-to-usb.python | 2 +- roles/svc-bkp-2-usb/handlers/main.yml | 5 +++++ .../meta/main.yml | 0 .../tasks/main.yml | 8 ++++---- .../templates/svc-sys-bkp-data-to-usb.service.j2 | 0 .../vars/main.yml | 4 ++-- roles/{sys-opt-swapfile => svc-opt-swapfile}/README.md | 2 +- .../{sys-opt-swapfile => svc-opt-swapfile}/meta/main.yml | 0 .../{sys-opt-swapfile => svc-opt-swapfile}/tasks/main.yml | 0 roles/svc-opt-swapfile/vars/main.yml | 1 + roles/svc-sys-bkp-data-to-usb/handlers/main.yml | 5 ----- roles/sys-opt-swapfile/vars/main.yml | 0 roles/util-desk-office-tools/vars/main.yml | 1 - .../README.md | 4 ++-- .../meta/main.yml | 2 +- .../tasks/main.yml | 0 roles/util-desk-office/vars/main.yml | 1 + 30 files changed, 27 insertions(+), 26 deletions(-) rename roles/{desk-nextcloud-client => desk-nextcloud}/README.md (100%) rename roles/{desk-nextcloud-client => desk-nextcloud}/meta/main.yml (100%) rename roles/{desk-nextcloud-client => desk-nextcloud}/tasks/main.yml (100%) rename roles/{desk-nextcloud-client => desk-nextcloud}/vars/main.yml (79%) rename roles/{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/README.md (100%) rename roles/{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/files/svc-sys-bkp-data-to-usb.python (98%) create mode 100644 roles/svc-bkp-2-usb/handlers/main.yml rename roles/{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/meta/main.yml (100%) rename roles/{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/tasks/main.yml (56%) rename roles/{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/templates/svc-sys-bkp-data-to-usb.service.j2 (100%) rename roles/{svc-sys-bkp-data-to-usb => svc-bkp-2-usb}/vars/main.yml (68%) rename roles/{sys-opt-swapfile => svc-opt-swapfile}/README.md (97%) rename roles/{sys-opt-swapfile => svc-opt-swapfile}/meta/main.yml (100%) rename roles/{sys-opt-swapfile => svc-opt-swapfile}/tasks/main.yml (100%) create mode 100644 roles/svc-opt-swapfile/vars/main.yml delete mode 100644 roles/svc-sys-bkp-data-to-usb/handlers/main.yml delete mode 100644 roles/sys-opt-swapfile/vars/main.yml delete mode 100644 roles/util-desk-office-tools/vars/main.yml rename roles/{util-desk-office-tools => util-desk-office}/README.md (86%) rename roles/{util-desk-office-tools => util-desk-office}/meta/main.yml (95%) rename roles/{util-desk-office-tools => util-desk-office}/tasks/main.yml (100%) create mode 100644 roles/util-desk-office/vars/main.yml diff --git a/docs/analysis/Features.md b/docs/analysis/Features.md index 1b82f2e5..a5acf749 100644 --- a/docs/analysis/Features.md +++ b/docs/analysis/Features.md @@ -15,7 +15,7 @@ Every business is unique, and so is CyMaIS! With a modular architecture, it adap With automated updates, system health checks, and security audits, CyMaIS ensures your infrastructure is always up-to-date and running smoothly. Roles such as `sys-hlth-docker-container`, `sys-hlth-btrfs`, and `sys-hlth-webserver` help monitor system integrity. ## Uncompromised Security 🔒 -Security is a top priority! CyMaIS includes robust security features like full-disk encryption recommendations, 2FA enforcement, encrypted server deployments (`web-app-keycloak`, `svc-db-openldap`), and secure backup solutions (`sys-bkp-remote-to-local`, `svc-sys-bkp-data-to-usb`). +Security is a top priority! CyMaIS includes robust security features like full-disk encryption recommendations, 2FA enforcement, encrypted server deployments (`web-app-keycloak`, `svc-db-openldap`), and secure backup solutions (`sys-bkp-remote-to-local`, `svc-bkp-2-usb`). ## User-Friendly with Expert Support 👩‍💻 No need to be a Linux or Docker expert! CyMaIS simplifies deployment with intuitive role-based automation. Documentation and community support make IT administration accessible to all experience levels. diff --git a/docs/guides/administrator/Readme.md b/docs/guides/administrator/Readme.md index ab718cbc..e8e36d7d 100644 --- a/docs/guides/administrator/Readme.md +++ b/docs/guides/administrator/Readme.md @@ -10,7 +10,7 @@ Follow these guides to install and configure CyMaIS: ## Key Responsibilities 🔧 - **User Management** - Configure LDAP, Keycloak, and user permissions. -- **Security & Backups** - Set up `sys-bkp-remote-to-local`, `svc-sys-bkp-data-to-usb`, and `core-security` roles. +- **Security & Backups** - Set up `sys-bkp-remote-to-local`, `svc-bkp-2-usb`, and `core-security` roles. - **Application Hosting** - Deploy services like `Nextcloud`, `Matrix`, `Gitea`, and more. - **Networking & VPN** - Configure `WireGuard`, `OpenVPN`, and `Nginx Reverse Proxy`. diff --git a/group_vars/all/05_maintenace.yml b/group_vars/all/05_maintenace.yml index f0d97169..d91e7a64 100644 --- a/group_vars/all/05_maintenace.yml +++ b/group_vars/all/05_maintenace.yml @@ -15,7 +15,7 @@ system_maintenance_lock_timeout_restart_docker: "{{system_maintenance_lock_ti system_maintenance_backup_services: - "sys-bkp-docker-to-local" - "svc-sys-bkp-rmt-2-loc" - - "svc-sys-bkp-data-to-usb" + - "svc-bkp-2-usb" - "sys-bkp-docker-to-local-everything" ### Defined Services for System Cleanup diff --git a/roles/desk-nextcloud-client/README.md b/roles/desk-nextcloud/README.md similarity index 100% rename from roles/desk-nextcloud-client/README.md rename to roles/desk-nextcloud/README.md diff --git a/roles/desk-nextcloud-client/meta/main.yml b/roles/desk-nextcloud/meta/main.yml similarity index 100% rename from roles/desk-nextcloud-client/meta/main.yml rename to roles/desk-nextcloud/meta/main.yml diff --git a/roles/desk-nextcloud-client/tasks/main.yml b/roles/desk-nextcloud/tasks/main.yml similarity index 100% rename from roles/desk-nextcloud-client/tasks/main.yml rename to roles/desk-nextcloud/tasks/main.yml diff --git a/roles/desk-nextcloud-client/vars/main.yml b/roles/desk-nextcloud/vars/main.yml similarity index 79% rename from roles/desk-nextcloud-client/vars/main.yml rename to roles/desk-nextcloud/vars/main.yml index 1f755e97..685f9b02 100644 --- a/roles/desk-nextcloud-client/vars/main.yml +++ b/roles/desk-nextcloud/vars/main.yml @@ -1,3 +1,3 @@ user_home_directory: /home/{{users.client.username}}/ cloud_directory: '{{user_home_directory}}Clouds/{{cloud_fqdn}}/{{users.client.username}}/' -application_id: desk-nextcloud-client +application_id: desk-nextcloud diff --git a/roles/drv-epson-multiprinter/vars/main.yml b/roles/drv-epson-multiprinter/vars/main.yml index 8b670473..3adf240a 100644 --- a/roles/drv-epson-multiprinter/vars/main.yml +++ b/roles/drv-epson-multiprinter/vars/main.yml @@ -1 +1 @@ -application_id: epson-multiprinter +application_id: drv-epson-multiprinter diff --git a/roles/drv-intel/vars/main.yml b/roles/drv-intel/vars/main.yml index b922dc9d..529333f1 100644 --- a/roles/drv-intel/vars/main.yml +++ b/roles/drv-intel/vars/main.yml @@ -1 +1 @@ -application_id: intel +application_id: drv-intel diff --git a/roles/drv-lid-switch/vars/main.yml b/roles/drv-lid-switch/vars/main.yml index 8997ffe1..9c258f06 100644 --- a/roles/drv-lid-switch/vars/main.yml +++ b/roles/drv-lid-switch/vars/main.yml @@ -1 +1 @@ -application_id: lid-switch +application_id: drv-lid-switch diff --git a/roles/drv-msi-keyboard-color/vars/main.yml b/roles/drv-msi-keyboard-color/vars/main.yml index 6770d79f..8d9961e1 100644 --- a/roles/drv-msi-keyboard-color/vars/main.yml +++ b/roles/drv-msi-keyboard-color/vars/main.yml @@ -1 +1 @@ -application_id: msi-keyboard-color +application_id: drv-msi-keyboard-color diff --git a/roles/drv-non-free/vars/main.yml b/roles/drv-non-free/vars/main.yml index 2bdbcf05..c3166143 100644 --- a/roles/drv-non-free/vars/main.yml +++ b/roles/drv-non-free/vars/main.yml @@ -1 +1 @@ -application_id: non-free +application_id: drv-non-free diff --git a/roles/svc-sys-bkp-data-to-usb/README.md b/roles/svc-bkp-2-usb/README.md similarity index 100% rename from roles/svc-sys-bkp-data-to-usb/README.md rename to roles/svc-bkp-2-usb/README.md diff --git a/roles/svc-sys-bkp-data-to-usb/files/svc-sys-bkp-data-to-usb.python b/roles/svc-bkp-2-usb/files/svc-sys-bkp-data-to-usb.python similarity index 98% rename from roles/svc-sys-bkp-data-to-usb/files/svc-sys-bkp-data-to-usb.python rename to roles/svc-bkp-2-usb/files/svc-sys-bkp-data-to-usb.python index 15551a8f..20d61edd 100644 --- a/roles/svc-sys-bkp-data-to-usb/files/svc-sys-bkp-data-to-usb.python +++ b/roles/svc-bkp-2-usb/files/svc-sys-bkp-data-to-usb.python @@ -21,7 +21,7 @@ def main(): machine_id = subprocess.run(["sha256sum", "/etc/machine-id"], capture_output=True, text=True).stdout.strip()[:64] print(f"machine id: {machine_id}") - versions_path = os.path.join(backup_to_usb_destination_path, f"{machine_id}/svc-sys-bkp-data-to-usb/") + versions_path = os.path.join(backup_to_usb_destination_path, f"{machine_id}/svc-bkp-2-usb/") print(f"versions path: {versions_path}") if not os.path.isdir(versions_path): diff --git a/roles/svc-bkp-2-usb/handlers/main.yml b/roles/svc-bkp-2-usb/handlers/main.yml new file mode 100644 index 00000000..8b124f4b --- /dev/null +++ b/roles/svc-bkp-2-usb/handlers/main.yml @@ -0,0 +1,5 @@ +- name: "reload svc-bkp-2-usb.cymais.service" + systemd: + name: svc-bkp-2-usb.cymais.service + state: reloaded + daemon_reload: yes diff --git a/roles/svc-sys-bkp-data-to-usb/meta/main.yml b/roles/svc-bkp-2-usb/meta/main.yml similarity index 100% rename from roles/svc-sys-bkp-data-to-usb/meta/main.yml rename to roles/svc-bkp-2-usb/meta/main.yml diff --git a/roles/svc-sys-bkp-data-to-usb/tasks/main.yml b/roles/svc-bkp-2-usb/tasks/main.yml similarity index 56% rename from roles/svc-sys-bkp-data-to-usb/tasks/main.yml rename to roles/svc-bkp-2-usb/tasks/main.yml index 5bfcd2b0..ed0dc7e9 100644 --- a/roles/svc-sys-bkp-data-to-usb/tasks/main.yml +++ b/roles/svc-bkp-2-usb/tasks/main.yml @@ -1,6 +1,6 @@ - name: Copy backup script to the scripts directory copy: - src: svc-sys-bkp-data-to-usb.python + src: svc-bkp-2-usb.python dest: "{{ backup_to_usb_script_path }}" owner: root group: root @@ -8,9 +8,9 @@ - name: Copy systemd service to systemd directory template: - src: svc-sys-bkp-data-to-usb.service.j2 - dest: /etc/systemd/system/svc-sys-bkp-data-to-usb.cymais.service + src: svc-bkp-2-usb.service.j2 + dest: /etc/systemd/system/svc-bkp-2-usb.cymais.service owner: root group: root mode: '0644' - notify: reload svc-sys-bkp-data-to-usb.cymais.service \ No newline at end of file + notify: reload svc-bkp-2-usb.cymais.service \ No newline at end of file diff --git a/roles/svc-sys-bkp-data-to-usb/templates/svc-sys-bkp-data-to-usb.service.j2 b/roles/svc-bkp-2-usb/templates/svc-sys-bkp-data-to-usb.service.j2 similarity index 100% rename from roles/svc-sys-bkp-data-to-usb/templates/svc-sys-bkp-data-to-usb.service.j2 rename to roles/svc-bkp-2-usb/templates/svc-sys-bkp-data-to-usb.service.j2 diff --git a/roles/svc-sys-bkp-data-to-usb/vars/main.yml b/roles/svc-bkp-2-usb/vars/main.yml similarity index 68% rename from roles/svc-sys-bkp-data-to-usb/vars/main.yml rename to roles/svc-bkp-2-usb/vars/main.yml index 6a4a4533..59a9af4d 100644 --- a/roles/svc-sys-bkp-data-to-usb/vars/main.yml +++ b/roles/svc-bkp-2-usb/vars/main.yml @@ -1,6 +1,6 @@ -backup_to_usb_script_path: /usr/local/sbin/svc-sys-bkp-data-to-usb.python +backup_to_usb_script_path: /usr/local/sbin/svc-bkp-2-usb.python backup_to_usb_destination: '{{backup_to_usb_mount}}{{backup_to_usb_destination_subdirectory}}' backups_folder_path: '{{backup_to_usb_destination}}' systemctl_mount_service_name: '{{ backup_to_usb_mount | trim(''/'') | replace(''/'', ''-'') }}.mount' -application_id: svc-sys-bkp-data-to-usb +application_id: svc-bkp-2-usb diff --git a/roles/sys-opt-swapfile/README.md b/roles/svc-opt-swapfile/README.md similarity index 97% rename from roles/sys-opt-swapfile/README.md rename to roles/svc-opt-swapfile/README.md index c8c6a9a2..12a135bd 100644 --- a/roles/sys-opt-swapfile/README.md +++ b/roles/svc-opt-swapfile/README.md @@ -1,4 +1,4 @@ -# System Swapfile Role +# System Swapfile ## Description diff --git a/roles/sys-opt-swapfile/meta/main.yml b/roles/svc-opt-swapfile/meta/main.yml similarity index 100% rename from roles/sys-opt-swapfile/meta/main.yml rename to roles/svc-opt-swapfile/meta/main.yml diff --git a/roles/sys-opt-swapfile/tasks/main.yml b/roles/svc-opt-swapfile/tasks/main.yml similarity index 100% rename from roles/sys-opt-swapfile/tasks/main.yml rename to roles/svc-opt-swapfile/tasks/main.yml diff --git a/roles/svc-opt-swapfile/vars/main.yml b/roles/svc-opt-swapfile/vars/main.yml new file mode 100644 index 00000000..0e49ac37 --- /dev/null +++ b/roles/svc-opt-swapfile/vars/main.yml @@ -0,0 +1 @@ +application_id: svc-opt-swapfile \ No newline at end of file diff --git a/roles/svc-sys-bkp-data-to-usb/handlers/main.yml b/roles/svc-sys-bkp-data-to-usb/handlers/main.yml deleted file mode 100644 index 139abb19..00000000 --- a/roles/svc-sys-bkp-data-to-usb/handlers/main.yml +++ /dev/null @@ -1,5 +0,0 @@ -- name: "reload svc-sys-bkp-data-to-usb.cymais.service" - systemd: - name: svc-sys-bkp-data-to-usb.cymais.service - state: reloaded - daemon_reload: yes diff --git a/roles/sys-opt-swapfile/vars/main.yml b/roles/sys-opt-swapfile/vars/main.yml deleted file mode 100644 index e69de29b..00000000 diff --git a/roles/util-desk-office-tools/vars/main.yml b/roles/util-desk-office-tools/vars/main.yml deleted file mode 100644 index bea619a6..00000000 --- a/roles/util-desk-office-tools/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -application_id: util-desk-office-tools diff --git a/roles/util-desk-office-tools/README.md b/roles/util-desk-office/README.md similarity index 86% rename from roles/util-desk-office-tools/README.md rename to roles/util-desk-office/README.md index 1c9ea4d0..5fce34a7 100644 --- a/roles/util-desk-office-tools/README.md +++ b/roles/util-desk-office/README.md @@ -1,4 +1,4 @@ -# util-desk-office-tools Role +# Office Tools ## Description @@ -6,7 +6,7 @@ This Ansible role installs a comprehensive suite of office productivity tools on ## Overview -The `util-desk-office-tools` role uses the `community.general.pacman` module to: +The `util-desk-office` role uses the `community.general.pacman` module to: 1. Install **Chromium** (web browser) 2. Install **Thunderbird** (email and RSS client) diff --git a/roles/util-desk-office-tools/meta/main.yml b/roles/util-desk-office/meta/main.yml similarity index 95% rename from roles/util-desk-office-tools/meta/main.yml rename to roles/util-desk-office/meta/main.yml index 759cdb97..d3bb6e89 100644 --- a/roles/util-desk-office-tools/meta/main.yml +++ b/roles/util-desk-office/meta/main.yml @@ -17,7 +17,7 @@ galaxy_info: - editor repository: "https://github.com/kevinveenbirkenbach/cymais" issue_tracker_url: "https://github.com/kevinveenbirkenbach/cymais/issues" - documentation: "https://github.com/kevinveenbirkenbach/cymais/tree/main/roles/util-desk-office-tools" + documentation: "https://github.com/kevinveenbirkenbach/cymais/tree/main/roles/util-desk-office" min_ansible_version: "2.9" platforms: - name: Archlinux diff --git a/roles/util-desk-office-tools/tasks/main.yml b/roles/util-desk-office/tasks/main.yml similarity index 100% rename from roles/util-desk-office-tools/tasks/main.yml rename to roles/util-desk-office/tasks/main.yml diff --git a/roles/util-desk-office/vars/main.yml b/roles/util-desk-office/vars/main.yml new file mode 100644 index 00000000..450cd4ef --- /dev/null +++ b/roles/util-desk-office/vars/main.yml @@ -0,0 +1 @@ +application_id: util-desk-office