diff --git a/docs/analysis/Features.md b/docs/analysis/Features.md index f3c730a9..527b7ba3 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 `mon-bot-docker-container`, `mon-bot-btrfs`, and `mon-bot-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`, `service-openldap`), and secure backup solutions (`bkp-remote-to-local`, `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-openldap`), and secure backup solutions (`bkp-remote-to-local`, `bkp-data-to-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/roles/README.md b/roles/README.md index e26c28a0..3969d2f0 100644 --- a/roles/README.md +++ b/roles/README.md @@ -39,7 +39,7 @@ For a complete list of role categories and detailed definitions, see: - **srv-web-composer** Aggregates multiple sub-filters into one include for your vhost. -- **web-service-*** +- **web-svc-*** Static‐content servers (assets, HTML, legal pages, file hosting). - **web-app-*** @@ -52,7 +52,7 @@ For a complete list of role categories and detailed definitions, see: - **net-*** Network infrastructure (DNS records, WireGuard, Let’s Encrypt entrypoints). -- **service-*** +- **svc-*** Docker‐deployed services that aren’t “apps” (RDBMS, LDAP, Redis, OpenLDAP). --- @@ -111,8 +111,8 @@ For a complete list of role categories and detailed definitions, see: --- > **Tip:** To find a role quickly, search for its prefix: -> `core-`, `gen-`, `desk-`, `srv-web-`, `web-service-`, `web-app-`, -> `net-`, `service-`, `monitor-`, `alert-`, `maint-`, `cln-`, +> `core-`, `gen-`, `desk-`, `srv-web-`, `web-svc-`, `web-app-`, +> `net-`, `svc-`, `monitor-`, `alert-`, `maint-`, `cln-`, > `bkp-`, `update-`, `pkgmgr-`, `user-`. --- diff --git a/roles/docker-compose/templates/base.yml.j2 b/roles/docker-compose/templates/base.yml.j2 index 6e717aee..b16dee9d 100644 --- a/roles/docker-compose/templates/base.yml.j2 +++ b/roles/docker-compose/templates/base.yml.j2 @@ -2,7 +2,7 @@ services: {# Load Database #} {% if applications[application_id].docker.services.database.enabled | default(false) | bool %} -{% include 'roles/service-rdbms-central/templates/services/main.yml.j2' %} +{% include 'roles/svc-rdbms-central/templates/services/main.yml.j2' %} {% endif %} {# Load Redis #} {% if applications[application_id].docker.services.redis.enabled | default(false) | bool %} diff --git a/roles/service-rdbms-central/templates/services/main.yml.j2 b/roles/service-rdbms-central/templates/services/main.yml.j2 deleted file mode 100644 index 699f3d89..00000000 --- a/roles/service-rdbms-central/templates/services/main.yml.j2 +++ /dev/null @@ -1 +0,0 @@ -{% include 'roles/service-rdbms-central/templates/services/' + database_type + '.yml.j2' %} \ No newline at end of file diff --git a/roles/service-openldap/README.md b/roles/svc-openldap/README.md similarity index 100% rename from roles/service-openldap/README.md rename to roles/svc-openldap/README.md diff --git a/roles/service-openldap/TODO.md b/roles/svc-openldap/TODO.md similarity index 100% rename from roles/service-openldap/TODO.md rename to roles/svc-openldap/TODO.md diff --git a/roles/service-openldap/__init__.py b/roles/svc-openldap/__init__.py similarity index 100% rename from roles/service-openldap/__init__.py rename to roles/svc-openldap/__init__.py diff --git a/roles/service-openldap/config/main.yml b/roles/svc-openldap/config/main.yml similarity index 100% rename from roles/service-openldap/config/main.yml rename to roles/svc-openldap/config/main.yml diff --git a/roles/service-openldap/docs/Administration.md b/roles/svc-openldap/docs/Administration.md similarity index 100% rename from roles/service-openldap/docs/Administration.md rename to roles/svc-openldap/docs/Administration.md diff --git a/roles/service-openldap/docs/Change_DN.md b/roles/svc-openldap/docs/Change_DN.md similarity index 100% rename from roles/service-openldap/docs/Change_DN.md rename to roles/svc-openldap/docs/Change_DN.md diff --git a/roles/service-openldap/docs/Installation.md b/roles/svc-openldap/docs/Installation.md similarity index 100% rename from roles/service-openldap/docs/Installation.md rename to roles/svc-openldap/docs/Installation.md diff --git a/roles/service-openldap/filter_plugins/__init__.py b/roles/svc-openldap/filter_plugins/__init__.py similarity index 100% rename from roles/service-openldap/filter_plugins/__init__.py rename to roles/svc-openldap/filter_plugins/__init__.py diff --git a/roles/service-openldap/filter_plugins/build_ldap_nested_group_entries.py b/roles/svc-openldap/filter_plugins/build_ldap_nested_group_entries.py similarity index 100% rename from roles/service-openldap/filter_plugins/build_ldap_nested_group_entries.py rename to roles/svc-openldap/filter_plugins/build_ldap_nested_group_entries.py diff --git a/roles/service-openldap/filter_plugins/build_ldap_role_entries.py b/roles/svc-openldap/filter_plugins/build_ldap_role_entries.py similarity index 100% rename from roles/service-openldap/filter_plugins/build_ldap_role_entries.py rename to roles/svc-openldap/filter_plugins/build_ldap_role_entries.py diff --git a/roles/service-openldap/handlers/main.yml b/roles/svc-openldap/handlers/main.yml similarity index 100% rename from roles/service-openldap/handlers/main.yml rename to roles/svc-openldap/handlers/main.yml diff --git a/roles/service-openldap/meta/main.yml b/roles/svc-openldap/meta/main.yml similarity index 100% rename from roles/service-openldap/meta/main.yml rename to roles/svc-openldap/meta/main.yml diff --git a/roles/service-openldap/schema/main.yml b/roles/svc-openldap/schema/main.yml similarity index 100% rename from roles/service-openldap/schema/main.yml rename to roles/svc-openldap/schema/main.yml diff --git a/roles/service-openldap/tasks/add_user_objects.yml b/roles/svc-openldap/tasks/add_user_objects.yml similarity index 100% rename from roles/service-openldap/tasks/add_user_objects.yml rename to roles/svc-openldap/tasks/add_user_objects.yml diff --git a/roles/service-openldap/tasks/create_ldif_files.yml b/roles/svc-openldap/tasks/create_ldif_files.yml similarity index 100% rename from roles/service-openldap/tasks/create_ldif_files.yml rename to roles/svc-openldap/tasks/create_ldif_files.yml diff --git a/roles/service-openldap/tasks/main.yml b/roles/svc-openldap/tasks/main.yml similarity index 100% rename from roles/service-openldap/tasks/main.yml rename to roles/svc-openldap/tasks/main.yml diff --git a/roles/service-openldap/tasks/reset_admin_passwords.yml b/roles/svc-openldap/tasks/reset_admin_passwords.yml similarity index 97% rename from roles/service-openldap/tasks/reset_admin_passwords.yml rename to roles/svc-openldap/tasks/reset_admin_passwords.yml index 24127f9f..61bbc478 100644 --- a/roles/service-openldap/tasks/reset_admin_passwords.yml +++ b/roles/svc-openldap/tasks/reset_admin_passwords.yml @@ -1,6 +1,6 @@ --- # Reset both Database and Configuration Admin passwords in LDAP via LDAPI -# roles/service-openldap/tasks/reset_admin_passwords.yml +# roles/svc-openldap/tasks/reset_admin_passwords.yml - name: "Query available LDAP databases" shell: | diff --git a/roles/service-openldap/tasks/schemas/nextcloud.yml b/roles/svc-openldap/tasks/schemas/nextcloud.yml similarity index 100% rename from roles/service-openldap/tasks/schemas/nextcloud.yml rename to roles/svc-openldap/tasks/schemas/nextcloud.yml diff --git a/roles/service-openldap/tasks/schemas/openssh_lpk.yml b/roles/svc-openldap/tasks/schemas/openssh_lpk.yml similarity index 100% rename from roles/service-openldap/tasks/schemas/openssh_lpk.yml rename to roles/svc-openldap/tasks/schemas/openssh_lpk.yml diff --git a/roles/service-openldap/templates/docker-compose.yml.j2 b/roles/svc-openldap/templates/docker-compose.yml.j2 similarity index 100% rename from roles/service-openldap/templates/docker-compose.yml.j2 rename to roles/svc-openldap/templates/docker-compose.yml.j2 diff --git a/roles/service-openldap/templates/env.j2 b/roles/svc-openldap/templates/env.j2 similarity index 100% rename from roles/service-openldap/templates/env.j2 rename to roles/svc-openldap/templates/env.j2 diff --git a/roles/service-openldap/templates/ldif/configuration/01_member_of_configuration.ldif.j2 b/roles/svc-openldap/templates/ldif/configuration/01_member_of_configuration.ldif.j2 similarity index 100% rename from roles/service-openldap/templates/ldif/configuration/01_member_of_configuration.ldif.j2 rename to roles/svc-openldap/templates/ldif/configuration/01_member_of_configuration.ldif.j2 diff --git a/roles/service-openldap/templates/ldif/configuration/02_member_of_configuration.ldif.j2 b/roles/svc-openldap/templates/ldif/configuration/02_member_of_configuration.ldif.j2 similarity index 100% rename from roles/service-openldap/templates/ldif/configuration/02_member_of_configuration.ldif.j2 rename to roles/svc-openldap/templates/ldif/configuration/02_member_of_configuration.ldif.j2 diff --git a/roles/service-openldap/templates/ldif/configuration/03_member_of_configuration.ldif.j2 b/roles/svc-openldap/templates/ldif/configuration/03_member_of_configuration.ldif.j2 similarity index 100% rename from roles/service-openldap/templates/ldif/configuration/03_member_of_configuration.ldif.j2 rename to roles/svc-openldap/templates/ldif/configuration/03_member_of_configuration.ldif.j2 diff --git a/roles/service-openldap/templates/ldif/configuration/04_hashed_password.ldif.j2 b/roles/svc-openldap/templates/ldif/configuration/04_hashed_password.ldif.j2 similarity index 100% rename from roles/service-openldap/templates/ldif/configuration/04_hashed_password.ldif.j2 rename to roles/svc-openldap/templates/ldif/configuration/04_hashed_password.ldif.j2 diff --git a/roles/service-openldap/templates/ldif/configuration/README.md b/roles/svc-openldap/templates/ldif/configuration/README.md similarity index 100% rename from roles/service-openldap/templates/ldif/configuration/README.md rename to roles/svc-openldap/templates/ldif/configuration/README.md diff --git a/roles/service-openldap/templates/ldif/data/01_rbac_group.ldif.j2 b/roles/svc-openldap/templates/ldif/data/01_rbac_group.ldif.j2 similarity index 100% rename from roles/service-openldap/templates/ldif/data/01_rbac_group.ldif.j2 rename to roles/svc-openldap/templates/ldif/data/01_rbac_group.ldif.j2 diff --git a/roles/service-openldap/templates/ldif/data/02_rbac_roles.ldif.j2 b/roles/svc-openldap/templates/ldif/data/02_rbac_roles.ldif.j2 similarity index 100% rename from roles/service-openldap/templates/ldif/data/02_rbac_roles.ldif.j2 rename to roles/svc-openldap/templates/ldif/data/02_rbac_roles.ldif.j2 diff --git a/roles/service-openldap/templates/ldif/data/README.md b/roles/svc-openldap/templates/ldif/data/README.md similarity index 100% rename from roles/service-openldap/templates/ldif/data/README.md rename to roles/svc-openldap/templates/ldif/data/README.md diff --git a/roles/service-openldap/templates/nginx.stream.conf.j2 b/roles/svc-openldap/templates/nginx.stream.conf.j2 similarity index 100% rename from roles/service-openldap/templates/nginx.stream.conf.j2 rename to roles/svc-openldap/templates/nginx.stream.conf.j2 diff --git a/roles/service-openldap/users/main.yml b/roles/svc-openldap/users/main.yml similarity index 100% rename from roles/service-openldap/users/main.yml rename to roles/svc-openldap/users/main.yml diff --git a/roles/service-openldap/vars/main.yml b/roles/svc-openldap/vars/main.yml similarity index 100% rename from roles/service-openldap/vars/main.yml rename to roles/svc-openldap/vars/main.yml diff --git a/roles/service-rdbms-central/README.md b/roles/svc-rdbms-central/README.md similarity index 100% rename from roles/service-rdbms-central/README.md rename to roles/svc-rdbms-central/README.md diff --git a/roles/service-rdbms-central/meta/main.yml b/roles/svc-rdbms-central/meta/main.yml similarity index 100% rename from roles/service-rdbms-central/meta/main.yml rename to roles/svc-rdbms-central/meta/main.yml diff --git a/roles/service-rdbms-central/tasks/main.yml b/roles/svc-rdbms-central/tasks/main.yml similarity index 100% rename from roles/service-rdbms-central/tasks/main.yml rename to roles/svc-rdbms-central/tasks/main.yml diff --git a/roles/service-rdbms-central/templates/configuration.yml.j2 b/roles/svc-rdbms-central/templates/configuration.yml.j2 similarity index 100% rename from roles/service-rdbms-central/templates/configuration.yml.j2 rename to roles/svc-rdbms-central/templates/configuration.yml.j2 diff --git a/roles/service-rdbms-central/templates/env/mariadb.env.j2 b/roles/svc-rdbms-central/templates/env/mariadb.env.j2 similarity index 100% rename from roles/service-rdbms-central/templates/env/mariadb.env.j2 rename to roles/svc-rdbms-central/templates/env/mariadb.env.j2 diff --git a/roles/service-rdbms-central/templates/env/postgres.env.j2 b/roles/svc-rdbms-central/templates/env/postgres.env.j2 similarity index 100% rename from roles/service-rdbms-central/templates/env/postgres.env.j2 rename to roles/svc-rdbms-central/templates/env/postgres.env.j2 diff --git a/roles/svc-rdbms-central/templates/services/main.yml.j2 b/roles/svc-rdbms-central/templates/services/main.yml.j2 new file mode 100644 index 00000000..5174ca10 --- /dev/null +++ b/roles/svc-rdbms-central/templates/services/main.yml.j2 @@ -0,0 +1 @@ +{% include 'roles/svc-rdbms-central/templates/services/' + database_type + '.yml.j2' %} \ No newline at end of file diff --git a/roles/service-rdbms-central/templates/services/mariadb.yml.j2 b/roles/svc-rdbms-central/templates/services/mariadb.yml.j2 similarity index 100% rename from roles/service-rdbms-central/templates/services/mariadb.yml.j2 rename to roles/svc-rdbms-central/templates/services/mariadb.yml.j2 diff --git a/roles/service-rdbms-central/templates/services/postgres.yml.j2 b/roles/svc-rdbms-central/templates/services/postgres.yml.j2 similarity index 100% rename from roles/service-rdbms-central/templates/services/postgres.yml.j2 rename to roles/svc-rdbms-central/templates/services/postgres.yml.j2 diff --git a/roles/service-rdbms-central/vars/database.yml b/roles/svc-rdbms-central/vars/database.yml similarity index 100% rename from roles/service-rdbms-central/vars/database.yml rename to roles/svc-rdbms-central/vars/database.yml diff --git a/roles/service-rdbms-central/vars/main.yml b/roles/svc-rdbms-central/vars/main.yml similarity index 100% rename from roles/service-rdbms-central/vars/main.yml rename to roles/svc-rdbms-central/vars/main.yml diff --git a/roles/service-rdbms-mariadb/Administration.md b/roles/svc-rdbms-mariadb/Administration.md similarity index 100% rename from roles/service-rdbms-mariadb/Administration.md rename to roles/svc-rdbms-mariadb/Administration.md diff --git a/roles/service-rdbms-mariadb/README.md b/roles/svc-rdbms-mariadb/README.md similarity index 100% rename from roles/service-rdbms-mariadb/README.md rename to roles/svc-rdbms-mariadb/README.md diff --git a/roles/service-rdbms-mariadb/config/main.yml b/roles/svc-rdbms-mariadb/config/main.yml similarity index 100% rename from roles/service-rdbms-mariadb/config/main.yml rename to roles/svc-rdbms-mariadb/config/main.yml diff --git a/roles/service-rdbms-mariadb/defaults/README.md b/roles/svc-rdbms-mariadb/defaults/README.md similarity index 91% rename from roles/service-rdbms-mariadb/defaults/README.md rename to roles/svc-rdbms-mariadb/defaults/README.md index 9f5a1ade..912ac735 100644 --- a/roles/service-rdbms-mariadb/defaults/README.md +++ b/roles/svc-rdbms-mariadb/defaults/README.md @@ -1,6 +1,6 @@ # defaults/ -This directory contains default variable definition files for the `service-rdbms-mariadb` Ansible role. It centralizes all configurable values related to MariaDB deployment and can be adjusted without modifying task logic. +This directory contains default variable definition files for the `svc-rdbms-mariadb` Ansible role. It centralizes all configurable values related to MariaDB deployment and can be adjusted without modifying task logic. --- @@ -34,7 +34,7 @@ Defines default values for how the MariaDB database should be created. To customize any of these values without editing role defaults: -1. Create or update a playbook-level vars file (e.g. `group_vars/all/service-rdbms-mariadb.yml`). +1. Create or update a playbook-level vars file (e.g. `group_vars/all/svc-rdbms-mariadb.yml`). 2. Set the desired values, for example: ```yaml diff --git a/roles/service-rdbms-mariadb/defaults/main.yml b/roles/svc-rdbms-mariadb/defaults/main.yml similarity index 100% rename from roles/service-rdbms-mariadb/defaults/main.yml rename to roles/svc-rdbms-mariadb/defaults/main.yml diff --git a/roles/service-rdbms-mariadb/meta/main.yml b/roles/svc-rdbms-mariadb/meta/main.yml similarity index 100% rename from roles/service-rdbms-mariadb/meta/main.yml rename to roles/svc-rdbms-mariadb/meta/main.yml diff --git a/roles/service-rdbms-mariadb/schema/main.yml b/roles/svc-rdbms-mariadb/schema/main.yml similarity index 100% rename from roles/service-rdbms-mariadb/schema/main.yml rename to roles/svc-rdbms-mariadb/schema/main.yml diff --git a/roles/service-rdbms-mariadb/tasks/main.yml b/roles/svc-rdbms-mariadb/tasks/main.yml similarity index 100% rename from roles/service-rdbms-mariadb/tasks/main.yml rename to roles/svc-rdbms-mariadb/tasks/main.yml diff --git a/roles/service-rdbms-mariadb/vars/README.md b/roles/svc-rdbms-mariadb/vars/README.md similarity index 80% rename from roles/service-rdbms-mariadb/vars/README.md rename to roles/svc-rdbms-mariadb/vars/README.md index 8ed70335..a30f2e59 100644 --- a/roles/service-rdbms-mariadb/vars/README.md +++ b/roles/svc-rdbms-mariadb/vars/README.md @@ -1,6 +1,6 @@ # vars/ -This directory contains variable definition files for the `service-rdbms-mariadb` Ansible role. It centralizes all configurable values related to MariaDB deployment and can be adjusted without modifying task logic. +This directory contains variable definition files for the `svc-rdbms-mariadb` Ansible role. It centralizes all configurable values related to MariaDB deployment and can be adjusted without modifying task logic. --- diff --git a/roles/service-rdbms-mariadb/vars/main.yml b/roles/svc-rdbms-mariadb/vars/main.yml similarity index 100% rename from roles/service-rdbms-mariadb/vars/main.yml rename to roles/svc-rdbms-mariadb/vars/main.yml diff --git a/roles/service-rdbms-postgres/Administration.md b/roles/svc-rdbms-postgres/Administration.md similarity index 100% rename from roles/service-rdbms-postgres/Administration.md rename to roles/svc-rdbms-postgres/Administration.md diff --git a/roles/service-rdbms-postgres/README.md b/roles/svc-rdbms-postgres/README.md similarity index 100% rename from roles/service-rdbms-postgres/README.md rename to roles/svc-rdbms-postgres/README.md diff --git a/roles/service-rdbms-postgres/Todo.md b/roles/svc-rdbms-postgres/Todo.md similarity index 100% rename from roles/service-rdbms-postgres/Todo.md rename to roles/svc-rdbms-postgres/Todo.md diff --git a/roles/service-rdbms-postgres/Upgrade.md b/roles/svc-rdbms-postgres/Upgrade.md similarity index 100% rename from roles/service-rdbms-postgres/Upgrade.md rename to roles/svc-rdbms-postgres/Upgrade.md diff --git a/roles/service-rdbms-postgres/config/main.yml b/roles/svc-rdbms-postgres/config/main.yml similarity index 100% rename from roles/service-rdbms-postgres/config/main.yml rename to roles/svc-rdbms-postgres/config/main.yml diff --git a/roles/service-rdbms-postgres/meta/main.yml b/roles/svc-rdbms-postgres/meta/main.yml similarity index 100% rename from roles/service-rdbms-postgres/meta/main.yml rename to roles/svc-rdbms-postgres/meta/main.yml diff --git a/roles/service-rdbms-postgres/schema/main.yml b/roles/svc-rdbms-postgres/schema/main.yml similarity index 100% rename from roles/service-rdbms-postgres/schema/main.yml rename to roles/svc-rdbms-postgres/schema/main.yml diff --git a/roles/service-rdbms-postgres/tasks/init_database.yml b/roles/svc-rdbms-postgres/tasks/init_database.yml similarity index 100% rename from roles/service-rdbms-postgres/tasks/init_database.yml rename to roles/svc-rdbms-postgres/tasks/init_database.yml diff --git a/roles/service-rdbms-postgres/tasks/main.yml b/roles/svc-rdbms-postgres/tasks/main.yml similarity index 100% rename from roles/service-rdbms-postgres/tasks/main.yml rename to roles/svc-rdbms-postgres/tasks/main.yml diff --git a/roles/service-rdbms-postgres/vars/main.yml b/roles/svc-rdbms-postgres/vars/main.yml similarity index 100% rename from roles/service-rdbms-postgres/vars/main.yml rename to roles/svc-rdbms-postgres/vars/main.yml diff --git a/roles/utils-srv-corporate-identity/meta/main.yml b/roles/utils-srv-corporate-identity/meta/main.yml index d19bd2d9..24b87bc1 100644 --- a/roles/utils-srv-corporate-identity/meta/main.yml +++ b/roles/utils-srv-corporate-identity/meta/main.yml @@ -24,6 +24,6 @@ galaxy_info: issue_tracker_url: https://s.veen.world/cymaisissues documentation: https://s.veen.world/cymais dependencies: - - web-service-legal - - web-service-assets + - web-svc-legal + - web-svc-assets - web-app-portfolio \ No newline at end of file diff --git a/roles/web-app-akaunting/tasks/main.yml b/roles/web-app-akaunting/tasks/main.yml index 701001f9..4e27d3d0 100644 --- a/roles/web-app-akaunting/tasks/main.yml +++ b/roles/web-app-akaunting/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-attendize/tasks/main.yml b/roles/web-app-attendize/tasks/main.yml index 8596fbc1..0505b2e1 100644 --- a/roles/web-app-attendize/tasks/main.yml +++ b/roles/web-app-attendize/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role for {{application_id}} to receive certs & do modification routines" include_role: diff --git a/roles/web-app-baserow/tasks/main.yml b/roles/web-app-baserow/tasks/main.yml index 3a3e7976..acb48c9b 100644 --- a/roles/web-app-baserow/tasks/main.yml +++ b/roles/web-app-baserow/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-coturn/tasks/main.yml b/roles/web-app-coturn/tasks/main.yml index 8c4f0e87..9e2ae1dd 100644 --- a/roles/web-app-coturn/tasks/main.yml +++ b/roles/web-app-coturn/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-discourse/tasks/main.yml b/roles/web-app-discourse/tasks/main.yml index 0c8f6af1..013af900 100644 --- a/roles/web-app-discourse/tasks/main.yml +++ b/roles/web-app-discourse/tasks/main.yml @@ -7,9 +7,9 @@ state: present when: run_once_docker_discourse is not defined -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central when: run_once_docker_discourse is not defined - name: "include role srv-web-proxy-domain for {{application_id}}" diff --git a/roles/web-app-espocrm/README.md b/roles/web-app-espocrm/README.md index 7119426e..cc2e27f7 100644 --- a/roles/web-app-espocrm/README.md +++ b/roles/web-app-espocrm/README.md @@ -8,7 +8,7 @@ Enhance your sales and service processes with EspoCRM, an open-source CRM featur This Ansible role deploys EspoCRM using Docker. It handles: -- MariaDB database provisioning via the `service-rdbms-central` role +- MariaDB database provisioning via the `svc-rdbms-central` role - Nginx domain setup with WebSocket and reverse-proxy configuration - Environment variable management through Jinja2 templates - Docker Compose orchestration for **web**, **daemon**, and **websocket** services diff --git a/roles/web-app-espocrm/tasks/main.yml b/roles/web-app-espocrm/tasks/main.yml index 28016371..213951a3 100644 --- a/roles/web-app-espocrm/tasks/main.yml +++ b/roles/web-app-espocrm/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "Include setup for domain '{{ domain }}'" include_role: diff --git a/roles/web-app-friendica/meta/main.yml b/roles/web-app-friendica/meta/main.yml index e9e70399..345e305a 100644 --- a/roles/web-app-friendica/meta/main.yml +++ b/roles/web-app-friendica/meta/main.yml @@ -21,4 +21,4 @@ galaxy_info: run_after: - web-app-matomo - web-app-keycloak - - service-openldap + - svc-openldap diff --git a/roles/web-app-friendica/tasks/main.yml b/roles/web-app-friendica/tasks/main.yml index 777b521b..5979511f 100644 --- a/roles/web-app-friendica/tasks/main.yml +++ b/roles/web-app-friendica/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "create {{ friendica_host_ldap_config }}" template: diff --git a/roles/web-app-funkwhale/meta/main.yml b/roles/web-app-funkwhale/meta/main.yml index ef5ebb90..50be2eb9 100644 --- a/roles/web-app-funkwhale/meta/main.yml +++ b/roles/web-app-funkwhale/meta/main.yml @@ -22,4 +22,4 @@ galaxy_info: - web-app-matomo - web-app-keycloak - web-app-mailu - - service-openldap \ No newline at end of file + - svc-openldap \ No newline at end of file diff --git a/roles/web-app-funkwhale/tasks/main.yml b/roles/web-app-funkwhale/tasks/main.yml index d0735771..08c2f188 100644 --- a/roles/web-app-funkwhale/tasks/main.yml +++ b/roles/web-app-funkwhale/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-gitea/tasks/main.yml b/roles/web-app-gitea/tasks/main.yml index 4e7b93f3..f5d727f3 100644 --- a/roles/web-app-gitea/tasks/main.yml +++ b/roles/web-app-gitea/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-gitlab/tasks/main.yml b/roles/web-app-gitlab/tasks/main.yml index 8c4f0e87..9e2ae1dd 100644 --- a/roles/web-app-gitlab/tasks/main.yml +++ b/roles/web-app-gitlab/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-joomla/tasks/main.yml b/roles/web-app-joomla/tasks/main.yml index ce9ab348..b3a92df7 100644 --- a/roles/web-app-joomla/tasks/main.yml +++ b/roles/web-app-joomla/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-keycloak/meta/main.yml b/roles/web-app-keycloak/meta/main.yml index 19c214fd..32723d3b 100644 --- a/roles/web-app-keycloak/meta/main.yml +++ b/roles/web-app-keycloak/meta/main.yml @@ -21,4 +21,4 @@ galaxy_info: class: "fa-solid fa-lock" run_after: - web-app-matomo - - service-openldap + - svc-openldap diff --git a/roles/web-app-keycloak/tasks/main.yml b/roles/web-app-keycloak/tasks/main.yml index e7b67e90..94581498 100644 --- a/roles/web-app-keycloak/tasks/main.yml +++ b/roles/web-app-keycloak/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml index 7ba7ec6f..db003d42 100644 --- a/roles/web-app-listmonk/tasks/main.yml +++ b/roles/web-app-listmonk/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: Set nginx_docker_reverse_proxy_extra_configuration based on applications[application_id].public_api_activated set_fact: diff --git a/roles/web-app-mailu/tasks/main.yml b/roles/web-app-mailu/tasks/main.yml index bcc597a4..535574dd 100644 --- a/roles/web-app-mailu/tasks/main.yml +++ b/roles/web-app-mailu/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "Include service-rdbms-central" +- name: "Include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central when: run_once_docker_mailu is not defined - name: "Include role srv-web-proxy-domain for {{ application_id }}" diff --git a/roles/web-app-mastodon/tasks/main.yml b/roles/web-app-mastodon/tasks/main.yml index 484375ad..e775963b 100644 --- a/roles/web-app-mastodon/tasks/main.yml +++ b/roles/web-app-mastodon/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "Include setup for domain '{{ domain }}'" include_role: diff --git a/roles/web-app-matomo/meta/main.yml b/roles/web-app-matomo/meta/main.yml index 5ac43ea7..13894cd4 100644 --- a/roles/web-app-matomo/meta/main.yml +++ b/roles/web-app-matomo/meta/main.yml @@ -19,4 +19,4 @@ galaxy_info: logo: class: "fa-solid fa-chart-line" run_after: - - "service-rdbms-postgres" \ No newline at end of file + - "svc-rdbms-postgres" \ No newline at end of file diff --git a/roles/web-app-matomo/tasks/main.yml b/roles/web-app-matomo/tasks/main.yml index e330f4fd..d560ea66 100644 --- a/roles/web-app-matomo/tasks/main.yml +++ b/roles/web-app-matomo/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central when: run_once_docker_matomo is not defined - name: "include role srv-web-proxy-domain for {{application_id}}" diff --git a/roles/web-app-matrix/tasks/create-and-seed-database.yml b/roles/web-app-matrix/tasks/create-and-seed-database.yml index d73278d4..d17eb251 100644 --- a/roles/web-app-matrix/tasks/create-and-seed-database.yml +++ b/roles/web-app-matrix/tasks/create-and-seed-database.yml @@ -6,7 +6,7 @@ # - database_password - name: "create {{database_name}} database" include_role: - name: service-rdbms-postgres + name: svc-rdbms-postgres when: applications | is_feature_enabled('central_database',application_id) - name: "include seed-database-to-backup.yml" diff --git a/roles/web-app-matrix/tasks/main.yml b/roles/web-app-matrix/tasks/main.yml index 3ca7b277..b3f85ccc 100644 --- a/roles/web-app-matrix/tasks/main.yml +++ b/roles/web-app-matrix/tasks/main.yml @@ -8,9 +8,9 @@ bridges: "{{ bridges_configuration | filter_enabled_bridges(applications[application_id].plugins) }}" changed_when: false -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role for {{application_id}} to receive certs & do modification routines" include_role: diff --git a/roles/web-app-mediawiki/tasks/main.yml b/roles/web-app-mediawiki/tasks/main.yml index d1239a66..bb677183 100644 --- a/roles/web-app-mediawiki/tasks/main.yml +++ b/roles/web-app-mediawiki/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-mobilizon/meta/main.yml b/roles/web-app-mobilizon/meta/main.yml index 79e8f0c4..8cc9bb02 100644 --- a/roles/web-app-mobilizon/meta/main.yml +++ b/roles/web-app-mobilizon/meta/main.yml @@ -22,5 +22,5 @@ galaxy_info: - web-app-matomo - web-app-keycloak - web-app-mailu - - service-openldap - - service-rdbms-postgres + - svc-openldap + - svc-rdbms-postgres diff --git a/roles/web-app-mobilizon/tasks/main.yml b/roles/web-app-mobilizon/tasks/main.yml index 2f3790a2..c1787dfc 100644 --- a/roles/web-app-mobilizon/tasks/main.yml +++ b/roles/web-app-mobilizon/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-moodle/tasks/main.yml b/roles/web-app-moodle/tasks/main.yml index cec2a8d6..001916b3 100644 --- a/roles/web-app-moodle/tasks/main.yml +++ b/roles/web-app-moodle/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-mybb/tasks/main.yml b/roles/web-app-mybb/tasks/main.yml index acb5e021..8eefd426 100644 --- a/roles/web-app-mybb/tasks/main.yml +++ b/roles/web-app-mybb/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include tasks setup-domain.yml with {{domains | get_domain(application_id)}}" include_tasks: setup-domain.yml diff --git a/roles/web-app-nextcloud/meta/main.yml b/roles/web-app-nextcloud/meta/main.yml index 3b45f1a3..a75063e3 100644 --- a/roles/web-app-nextcloud/meta/main.yml +++ b/roles/web-app-nextcloud/meta/main.yml @@ -32,4 +32,4 @@ galaxy_info: - web-app-collabora - web-app-keycloak - web-app-mastodon - - service-rdbms-mariadb + - svc-rdbms-mariadb diff --git a/roles/web-app-nextcloud/tasks/main.yml b/roles/web-app-nextcloud/tasks/main.yml index 82ffccf7..83864cbe 100644 --- a/roles/web-app-nextcloud/tasks/main.yml +++ b/roles/web-app-nextcloud/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "create {{ nextcloud_host_config_additives_directory }}" file: diff --git a/roles/web-app-openproject/tasks/main.yml b/roles/web-app-openproject/tasks/main.yml index 1d58aa87..2ad2c5e2 100644 --- a/roles/web-app-openproject/tasks/main.yml +++ b/roles/web-app-openproject/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-peertube/tasks/main.yml b/roles/web-app-peertube/tasks/main.yml index 05931a93..4f8f26dd 100644 --- a/roles/web-app-peertube/tasks/main.yml +++ b/roles/web-app-peertube/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include create-domains.yml for peertube" include_tasks: create-domains.yml diff --git a/roles/web-app-phpldapadmin/meta/main.yml b/roles/web-app-phpldapadmin/meta/main.yml index 7805cc10..7a0ce8cd 100644 --- a/roles/web-app-phpldapadmin/meta/main.yml +++ b/roles/web-app-phpldapadmin/meta/main.yml @@ -24,6 +24,6 @@ galaxy_info: logo: class: "fa-solid fa-user-lock" run_after: - - service-openldap + - svc-openldap - web-app-matomo - web-app-keycloak diff --git a/roles/web-app-phpmyadmin/meta/main.yml b/roles/web-app-phpmyadmin/meta/main.yml index 4e083606..2cb8872b 100644 --- a/roles/web-app-phpmyadmin/meta/main.yml +++ b/roles/web-app-phpmyadmin/meta/main.yml @@ -26,6 +26,6 @@ galaxy_info: logo: class: "fa-solid fa-database" run_after: - - service-rdbms-mariadb + - svc-rdbms-mariadb - web-app-matomo - web-app-keycloak \ No newline at end of file diff --git a/roles/web-app-pixelfed/tasks/main.yml b/roles/web-app-pixelfed/tasks/main.yml index 8c4f0e87..9e2ae1dd 100644 --- a/roles/web-app-pixelfed/tasks/main.yml +++ b/roles/web-app-pixelfed/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-snipe-it/tasks/main.yml b/roles/web-app-snipe-it/tasks/main.yml index 23c91fa9..55d3a48c 100644 --- a/roles/web-app-snipe-it/tasks/main.yml +++ b/roles/web-app-snipe-it/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-syncope/tasks/main.yml b/roles/web-app-syncope/tasks/main.yml index 1c7efca8..40da757d 100644 --- a/roles/web-app-syncope/tasks/main.yml +++ b/roles/web-app-syncope/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role for {{application_id}} to receive certs & do modification routines" include_role: diff --git a/roles/web-app-taiga/meta/main.yml b/roles/web-app-taiga/meta/main.yml index 5289091f..a722a02e 100644 --- a/roles/web-app-taiga/meta/main.yml +++ b/roles/web-app-taiga/meta/main.yml @@ -29,6 +29,6 @@ galaxy_info: logo: class: "fa-solid fa-tasks" run_after: - - service-rdbms-postgres + - svc-rdbms-postgres - web-app-matomo - web-app-keycloak diff --git a/roles/web-app-taiga/tasks/main.yml b/roles/web-app-taiga/tasks/main.yml index f5094638..427b1e15 100644 --- a/roles/web-app-taiga/tasks/main.yml +++ b/roles/web-app-taiga/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-app-wordpress/tasks/main.yml b/roles/web-app-wordpress/tasks/main.yml index bc002adc..fc73cf04 100644 --- a/roles/web-app-wordpress/tasks/main.yml +++ b/roles/web-app-wordpress/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "Include service-rdbms-central" +- name: "Include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "Include role srv-web-proxy-domain for {{ application_id }}" include_role: diff --git a/roles/web-app-yourls/meta/main.yml b/roles/web-app-yourls/meta/main.yml index 58727d26..c67698f7 100644 --- a/roles/web-app-yourls/meta/main.yml +++ b/roles/web-app-yourls/meta/main.yml @@ -25,6 +25,6 @@ galaxy_info: logo: class: "fa-solid fa-link" run_after: - - service-rdbms-mariadb + - svc-rdbms-mariadb - web-app-matomo - web-app-keycloak \ No newline at end of file diff --git a/roles/web-app-yourls/tasks/main.yml b/roles/web-app-yourls/tasks/main.yml index 6c19143b..f83fbfab 100644 --- a/roles/web-app-yourls/tasks/main.yml +++ b/roles/web-app-yourls/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: "include role srv-web-proxy-domain for {{application_id}}" include_role: diff --git a/roles/web-service-assets/meta/main.yml b/roles/web-service-assets/meta/main.yml deleted file mode 100644 index 844c949f..00000000 --- a/roles/web-service-assets/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- web-service-files diff --git a/roles/web-service-legal/meta/main.yml b/roles/web-service-legal/meta/main.yml deleted file mode 100644 index a85a8fa6..00000000 --- a/roles/web-service-legal/meta/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -dependencies: -- web-service-html diff --git a/roles/web-service-assets/README.md b/roles/web-svc-assets/README.md similarity index 100% rename from roles/web-service-assets/README.md rename to roles/web-svc-assets/README.md diff --git a/roles/web-service-assets/config/main.yml b/roles/web-svc-assets/config/main.yml similarity index 100% rename from roles/web-service-assets/config/main.yml rename to roles/web-svc-assets/config/main.yml diff --git a/roles/web-svc-assets/meta/main.yml b/roles/web-svc-assets/meta/main.yml new file mode 100644 index 00000000..3bbce2c3 --- /dev/null +++ b/roles/web-svc-assets/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- web-svc-files diff --git a/roles/web-service-assets/tasks/main.yml b/roles/web-svc-assets/tasks/main.yml similarity index 100% rename from roles/web-service-assets/tasks/main.yml rename to roles/web-svc-assets/tasks/main.yml diff --git a/roles/web-service-assets/vars/main.yml b/roles/web-svc-assets/vars/main.yml similarity index 100% rename from roles/web-service-assets/vars/main.yml rename to roles/web-svc-assets/vars/main.yml diff --git a/roles/web-service-files/README.md b/roles/web-svc-files/README.md similarity index 100% rename from roles/web-service-files/README.md rename to roles/web-svc-files/README.md diff --git a/roles/web-service-files/config/main.yml b/roles/web-svc-files/config/main.yml similarity index 100% rename from roles/web-service-files/config/main.yml rename to roles/web-svc-files/config/main.yml diff --git a/roles/web-service-files/meta/main.yml b/roles/web-svc-files/meta/main.yml similarity index 100% rename from roles/web-service-files/meta/main.yml rename to roles/web-svc-files/meta/main.yml diff --git a/roles/web-service-files/tasks/main.yml b/roles/web-svc-files/tasks/main.yml similarity index 100% rename from roles/web-service-files/tasks/main.yml rename to roles/web-svc-files/tasks/main.yml diff --git a/roles/web-service-files/templates/nginx.conf.j2 b/roles/web-svc-files/templates/nginx.conf.j2 similarity index 100% rename from roles/web-service-files/templates/nginx.conf.j2 rename to roles/web-svc-files/templates/nginx.conf.j2 diff --git a/roles/web-service-files/vars/main.yml b/roles/web-svc-files/vars/main.yml similarity index 100% rename from roles/web-service-files/vars/main.yml rename to roles/web-svc-files/vars/main.yml diff --git a/roles/web-service-html/README.md b/roles/web-svc-html/README.md similarity index 100% rename from roles/web-service-html/README.md rename to roles/web-svc-html/README.md diff --git a/roles/web-service-html/config/main.yml b/roles/web-svc-html/config/main.yml similarity index 100% rename from roles/web-service-html/config/main.yml rename to roles/web-svc-html/config/main.yml diff --git a/roles/web-service-html/meta/main.yml b/roles/web-svc-html/meta/main.yml similarity index 100% rename from roles/web-service-html/meta/main.yml rename to roles/web-svc-html/meta/main.yml diff --git a/roles/web-service-html/tasks/main.yml b/roles/web-svc-html/tasks/main.yml similarity index 100% rename from roles/web-service-html/tasks/main.yml rename to roles/web-svc-html/tasks/main.yml diff --git a/roles/web-service-html/templates/nginx.conf.j2 b/roles/web-svc-html/templates/nginx.conf.j2 similarity index 100% rename from roles/web-service-html/templates/nginx.conf.j2 rename to roles/web-svc-html/templates/nginx.conf.j2 diff --git a/roles/web-service-html/vars/main.yml b/roles/web-svc-html/vars/main.yml similarity index 100% rename from roles/web-service-html/vars/main.yml rename to roles/web-svc-html/vars/main.yml diff --git a/roles/web-service-legal/README.md b/roles/web-svc-legal/README.md similarity index 100% rename from roles/web-service-legal/README.md rename to roles/web-svc-legal/README.md diff --git a/roles/web-svc-legal/meta/main.yml b/roles/web-svc-legal/meta/main.yml new file mode 100644 index 00000000..805546b4 --- /dev/null +++ b/roles/web-svc-legal/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: +- web-svc-html diff --git a/roles/web-service-legal/tasks/main.yml b/roles/web-svc-legal/tasks/main.yml similarity index 100% rename from roles/web-service-legal/tasks/main.yml rename to roles/web-svc-legal/tasks/main.yml diff --git a/roles/web-service-legal/templates/imprint.html.j2 b/roles/web-svc-legal/templates/imprint.html.j2 similarity index 100% rename from roles/web-service-legal/templates/imprint.html.j2 rename to roles/web-svc-legal/templates/imprint.html.j2 diff --git a/roles/web-service-legal/vars/main.yml b/roles/web-svc-legal/vars/main.yml similarity index 100% rename from roles/web-service-legal/vars/main.yml rename to roles/web-svc-legal/vars/main.yml diff --git a/tasks/plays/02_server.yml b/tasks/plays/02_server.yml index 7f8edb4a..624b8b6f 100644 --- a/tasks/plays/02_server.yml +++ b/tasks/plays/02_server.yml @@ -15,12 +15,12 @@ include_tasks: "./tasks/utils/web-app-roles.yml" # Native Webserver Roles -- name: setup web-service-htmls +- name: setup web-svc-htmls include_role: - name: web-service-html + name: web-svc-html vars: domain: "{{primary_domain}}" - when: ('web-service-htmls' | application_allowed(group_names, allowed_applications)) + when: ('web-svc-htmls' | application_allowed(group_names, allowed_applications)) - name: "setup corporate identity" include_role: diff --git a/tasks/utils/web-app-roles.yml b/tasks/utils/web-app-roles.yml index 5145a4b7..53f5473a 100644 --- a/tasks/utils/web-app-roles.yml +++ b/tasks/utils/web-app-roles.yml @@ -13,7 +13,7 @@ - name: setup postgres when: ('postgres' | application_allowed(group_names, allowed_applications)) include_role: - name: service-rdbms-postgres + name: svc-rdbms-postgres - name: flush handlers after postgres meta: flush_handlers - name: setup syncope @@ -31,7 +31,7 @@ - name: setup ldap when: ('ldap' | application_allowed(group_names, allowed_applications)) include_role: - name: service-openldap + name: svc-openldap - name: flush handlers after ldap meta: flush_handlers - name: setup None @@ -55,7 +55,7 @@ - name: setup mariadb when: ('mariadb' | application_allowed(group_names, allowed_applications)) include_role: - name: service-rdbms-mariadb + name: svc-rdbms-mariadb - name: flush handlers after mariadb meta: flush_handlers - name: setup simpleicons @@ -67,7 +67,7 @@ - name: setup None when: ('None' | application_allowed(group_names, allowed_applications)) include_role: - name: service-rdbms-central + name: svc-rdbms-central - name: flush handlers after None meta: flush_handlers - name: setup roulette-wheel diff --git a/templates/roles/web-app/tasks/main.yml.j2 b/templates/roles/web-app/tasks/main.yml.j2 index 4846951e..b021d7ff 100644 --- a/templates/roles/web-app/tasks/main.yml.j2 +++ b/templates/roles/web-app/tasks/main.yml.j2 @@ -3,9 +3,9 @@ {% if database_type | bool %} {% raw %} -- name: "include service-rdbms-central" +- name: "include svc-rdbms-central" include_role: - name: service-rdbms-central + name: svc-rdbms-central when: run_once_docker_{% endraw %}{{ application_id }}{% raw %} is not defined {% endraw %} diff --git a/tests/integration/test_application_id_consistency.py b/tests/integration/test_application_id_consistency.py index 42222d64..0bc9cdd3 100644 --- a/tests/integration/test_application_id_consistency.py +++ b/tests/integration/test_application_id_consistency.py @@ -11,7 +11,7 @@ class TestApplicationIdConsistency(unittest.TestCase): failed_roles = [] for role_path in ROLES_DIR.iterdir(): - if role_path.name in ["docker-container","docker-compose", "service-rdbms-central", "docker-repository-setup"]: + if role_path.name in ["docker-container","docker-compose", "svc-rdbms-central", "docker-repository-setup"]: continue if role_path.is_dir() and role_path.name.startswith("web-app-"): diff --git a/tests/unit/roles/service-openldap/__init__.py b/tests/unit/roles/svc-openldap/__init__.py similarity index 100% rename from tests/unit/roles/service-openldap/__init__.py rename to tests/unit/roles/svc-openldap/__init__.py diff --git a/tests/unit/roles/service-openldap/test_build_ldap_role_entries.py b/tests/unit/roles/svc-openldap/test_build_ldap_role_entries.py similarity index 98% rename from tests/unit/roles/service-openldap/test_build_ldap_role_entries.py rename to tests/unit/roles/svc-openldap/test_build_ldap_role_entries.py index 9d575b5f..6576019c 100644 --- a/tests/unit/roles/service-openldap/test_build_ldap_role_entries.py +++ b/tests/unit/roles/svc-openldap/test_build_ldap_role_entries.py @@ -5,7 +5,7 @@ import importlib.util # Dynamisch den Filter-Plugin Pfad hinzufĂŒgen current_dir = os.path.dirname(__file__) -filter_plugin_path = os.path.abspath(os.path.join(current_dir, "../../../../roles/service-openldap/filter_plugins")) +filter_plugin_path = os.path.abspath(os.path.join(current_dir, "../../../../roles/svc-openldap/filter_plugins")) # Modul dynamisch laden spec = importlib.util.spec_from_file_location("build_ldap_role_entries", os.path.join(filter_plugin_path, "build_ldap_role_entries.py"))