From 6ea8301364e735ae3135afe2d854ff87ab99a121 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 28 Aug 2025 22:23:09 +0200 Subject: [PATCH] Refactor: migrate cmp/* and srv/* roles into sys-stk/* and sys-svc/* namespaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed obsolete 'cmp' category, introduced 'stk' category (fa-bars-staggered icon). - Renamed roles: * cmp-db-docker → sys-stk-back-stateful * cmp-docker-oauth2 → sys-stk-back-stateless * srv-domain-provision → sys-stk-front * cmp-db-docker-proxy → sys-stk-full-stateful * cmp-docker-proxy → sys-stk-full-stateless * cmp-rdbms → sys-svc-rdbms - Updated all include_role references, vars, templates and README.md files. - Adjusted run_once comments and variable paths accordingly. - Updated all web-app roles to use new sys-stk/* and sys-svc/* roles. Conversation: https://chatgpt.com/share/68b0ba66-09f8-800f-86fc-76c47009d431 --- roles/categories.yml | 10 +++++----- roles/cmp-db-docker-proxy/README.md | 11 ----------- roles/cmp-db-docker/vars/main.yml | 1 - roles/cmp-rdbms/templates/services/main.yml.j2 | 1 - roles/docker-compose/templates/base.yml.j2 | 2 +- .../README.md | 8 ++++---- .../meta/main.yml | 0 .../tasks/main.yml | 8 ++++---- roles/sys-stk-back-stateful/vars/main.yml | 1 + .../README.md | 2 +- .../defaults/main.yml | 0 .../meta/main.yml | 0 .../tasks/main.yml | 2 +- .../README.md | 2 +- .../defaults/main.yml | 0 .../meta/main.yml | 0 .../tasks/01_cloudflare.yml | 0 .../tasks/cloudflare/01_cleanup.yml | 0 .../tasks/cloudflare/02_enable_cf_dev_mode.yml | 1 - .../tasks/main.yml | 2 +- .../vars/main.yml | 0 roles/sys-stk-full-stateful/README.md | 11 +++++++++++ .../meta/main.yml | 2 +- .../tasks/main.yml | 14 +++++++------- .../README.md | 2 +- .../meta/main.yml | 2 +- .../tasks/main.yml | 11 +++++------ roles/{cmp-rdbms => sys-svc-rdbms}/README.md | 0 roles/{cmp-rdbms => sys-svc-rdbms}/meta/main.yml | 0 roles/{cmp-rdbms => sys-svc-rdbms}/tasks/main.yml | 2 +- .../templates/configuration.yml.j2 | 0 .../templates/env/mariadb.env.j2 | 0 .../templates/env/postgres.env.j2 | 0 roles/sys-svc-rdbms/templates/services/main.yml.j2 | 1 + .../templates/services/mariadb.yml.j2 | 0 .../templates/services/postgres.yml.j2 | 0 .../{cmp-rdbms => sys-svc-rdbms}/vars/database.yml | 0 roles/{cmp-rdbms => sys-svc-rdbms}/vars/main.yml | 0 roles/web-app-akaunting/tasks/main.yml | 2 +- roles/web-app-attendize/tasks/main.yml | 2 +- roles/web-app-baserow/tasks/main.yml | 2 +- roles/web-app-bigbluebutton/tasks/main.yml | 2 +- roles/web-app-bluesky/tasks/main.yml | 4 ++-- roles/web-app-desktop/tasks/01_core.yml | 2 +- roles/web-app-discourse/tasks/02_reset.yml | 2 +- roles/web-app-discourse/tasks/03_docker.yml | 2 +- roles/web-app-elk/tasks/main.yml | 4 ++-- roles/web-app-espocrm/README.md | 2 +- roles/web-app-espocrm/tasks/main.yml | 2 +- roles/web-app-friendica/tasks/main.yml | 2 +- roles/web-app-funkwhale/tasks/main.yml | 2 +- roles/web-app-fusiondirectory/README.md | 2 +- roles/web-app-fusiondirectory/tasks/main.yml | 2 +- roles/web-app-gitea/tasks/main.yml | 2 +- roles/web-app-gitlab/tasks/main.yml | 2 +- roles/web-app-jenkins/tasks/main.yml | 2 +- roles/web-app-joomla/README.md | 2 +- roles/web-app-joomla/tasks/main.yml | 6 +++--- roles/web-app-keycloak/tasks/01_meta.yml | 2 +- roles/web-app-keycloak/tasks/04_dependencies.yml | 2 +- roles/web-app-lam/tasks/main.yml | 2 +- roles/web-app-listmonk/tasks/main.yml | 2 +- roles/web-app-mailu/tasks/01_core.yml | 2 +- roles/web-app-mastodon/tasks/main.yml | 4 ++-- roles/web-app-matomo/tasks/01_core.yml | 2 +- roles/web-app-matrix/tasks/01_docker.yml | 2 +- roles/web-app-matrix/tasks/03_webserver.yml | 4 ++-- roles/web-app-mediawiki/tasks/main.yml | 2 +- roles/web-app-mig/tasks/01_core.yml | 2 +- roles/web-app-mobilizon/tasks/main.yml | 2 +- roles/web-app-moodle/tasks/main.yml | 2 +- roles/web-app-mybb/tasks/main.yml | 2 +- roles/web-app-navigator/tasks/main.yml | 2 +- roles/web-app-nextcloud/tasks/main.yml | 2 +- roles/web-app-openproject/tasks/main.yml | 2 +- roles/web-app-peertube/tasks/main.yml | 2 +- roles/web-app-pgadmin/tasks/main.yml | 2 +- roles/web-app-phpldapadmin/tasks/main.yml | 2 +- roles/web-app-phpmyadmin/tasks/main.yml | 2 +- roles/web-app-pixelfed/tasks/main.yml | 2 +- roles/web-app-pretix/tasks/main.yml | 2 +- roles/web-app-snipe-it/tasks/main.yml | 2 +- roles/web-app-sphinx/tasks/main.yml | 2 +- roles/web-app-syncope/tasks/main.yml | 2 +- roles/web-app-taiga/README.md | 2 +- roles/web-app-taiga/tasks/main.yml | 2 +- roles/web-app-wordpress/tasks/main.yml | 6 +++--- roles/web-app-yourls/tasks/main.yml | 2 +- roles/web-svc-collabora/tasks/01_core.yml | 2 +- roles/web-svc-coturn/tasks/main.yml | 2 +- roles/web-svc-libretranslate/tasks/main.yml | 2 +- roles/web-svc-logout/tasks/main.yml | 2 +- roles/web-svc-simpleicons/tasks/main.yml | 2 +- templates/roles/web-app/tasks/main.yml.j2 | 4 ++-- 94 files changed, 112 insertions(+), 114 deletions(-) delete mode 100644 roles/cmp-db-docker-proxy/README.md delete mode 100644 roles/cmp-db-docker/vars/main.yml delete mode 100644 roles/cmp-rdbms/templates/services/main.yml.j2 rename roles/{cmp-db-docker => sys-stk-back-stateful}/README.md (61%) rename roles/{cmp-db-docker => sys-stk-back-stateful}/meta/main.yml (100%) rename roles/{cmp-db-docker => sys-stk-back-stateful}/tasks/main.yml (77%) create mode 100644 roles/sys-stk-back-stateful/vars/main.yml rename roles/{cmp-docker-oauth2 => sys-stk-back-stateless}/README.md (96%) rename roles/{cmp-docker-oauth2 => sys-stk-back-stateless}/defaults/main.yml (100%) rename roles/{cmp-docker-oauth2 => sys-stk-back-stateless}/meta/main.yml (100%) rename roles/{cmp-docker-oauth2 => sys-stk-back-stateless}/tasks/main.yml (93%) rename roles/{srv-domain-provision => sys-stk-front}/README.md (93%) rename roles/{srv-domain-provision => sys-stk-front}/defaults/main.yml (100%) rename roles/{srv-domain-provision => sys-stk-front}/meta/main.yml (100%) rename roles/{srv-domain-provision => sys-stk-front}/tasks/01_cloudflare.yml (100%) rename roles/{srv-domain-provision => sys-stk-front}/tasks/cloudflare/01_cleanup.yml (100%) rename roles/{srv-domain-provision => sys-stk-front}/tasks/cloudflare/02_enable_cf_dev_mode.yml (95%) rename roles/{srv-domain-provision => sys-stk-front}/tasks/main.yml (95%) rename roles/{srv-domain-provision => sys-stk-front}/vars/main.yml (100%) create mode 100644 roles/sys-stk-full-stateful/README.md rename roles/{cmp-db-docker-proxy => sys-stk-full-stateful}/meta/main.yml (79%) rename roles/{cmp-db-docker-proxy => sys-stk-full-stateful}/tasks/main.yml (66%) rename roles/{cmp-docker-proxy => sys-stk-full-stateless}/README.md (73%) rename roles/{cmp-docker-proxy => sys-stk-full-stateless}/meta/main.yml (84%) rename roles/{cmp-docker-proxy => sys-stk-full-stateless}/tasks/main.yml (52%) rename roles/{cmp-rdbms => sys-svc-rdbms}/README.md (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/meta/main.yml (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/tasks/main.yml (96%) rename roles/{cmp-rdbms => sys-svc-rdbms}/templates/configuration.yml.j2 (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/templates/env/mariadb.env.j2 (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/templates/env/postgres.env.j2 (100%) create mode 100644 roles/sys-svc-rdbms/templates/services/main.yml.j2 rename roles/{cmp-rdbms => sys-svc-rdbms}/templates/services/mariadb.yml.j2 (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/templates/services/postgres.yml.j2 (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/vars/database.yml (100%) rename roles/{cmp-rdbms => sys-svc-rdbms}/vars/main.yml (100%) diff --git a/roles/categories.yml b/roles/categories.yml index fade4ae5..2f8cba1a 100644 --- a/roles/categories.yml +++ b/roles/categories.yml @@ -1,9 +1,4 @@ roles: - cmp: - title: "Compositions" - description: "Composition of other roles." - icon: "fas fa-sitemap" - invokable: false docker: title: "Docker Toolkit" description: "Generic Docker helpers and utilities (compose wrappers, container tooling)." @@ -56,6 +51,11 @@ roles: description: "DNS providers, records, and rDNS management (Cloudflare, Hetzner, etc.)." icon: "fas fa-network-wired" invokable: false + stk: + title: "Stack" + description: "Stack levels to setup the server" + icon: "fas fa-bars-staggered" + invokable: false update: title: "Updates & Package Management" description: "OS & package updates" diff --git a/roles/cmp-db-docker-proxy/README.md b/roles/cmp-db-docker-proxy/README.md deleted file mode 100644 index 17e1db78..00000000 --- a/roles/cmp-db-docker-proxy/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Database Docker with Web Proxy - -This role builds on `cmp-db-docker` by adding a reverse-proxy frontend for HTTP access to your database service. - -## Features - -- **Database Composition** - Leverages the `cmp-db-docker` role to stand up your containerized database (PostgreSQL, MariaDB, etc.) with backups and user management. - -- **Reverse Proxy** - Includes the `srv-domain-provision` role to configure a proxy (e.g. nginx) for routing HTTP(S) traffic to your database UI or management endpoint. \ No newline at end of file diff --git a/roles/cmp-db-docker/vars/main.yml b/roles/cmp-db-docker/vars/main.yml deleted file mode 100644 index 0a12743f..00000000 --- a/roles/cmp-db-docker/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -DATABASE_VARS_FILE: "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml" \ No newline at end of file diff --git a/roles/cmp-rdbms/templates/services/main.yml.j2 b/roles/cmp-rdbms/templates/services/main.yml.j2 deleted file mode 100644 index df1bb93a..00000000 --- a/roles/cmp-rdbms/templates/services/main.yml.j2 +++ /dev/null @@ -1 +0,0 @@ -{% include 'roles/cmp-rdbms/templates/services/' + database_type + '.yml.j2' %} \ No newline at end of file diff --git a/roles/docker-compose/templates/base.yml.j2 b/roles/docker-compose/templates/base.yml.j2 index 16e90b16..00678131 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 | is_docker_service_enabled(application_id, 'database') %} -{% include 'roles/cmp-rdbms/templates/services/main.yml.j2' %} +{% include 'roles/sys-svc-rdbms/templates/services/main.yml.j2' %} {% endif %} {# Load Redis #} {% if applications | is_docker_service_enabled(application_id, 'redis') or applications | get_app_conf(application_id, 'features.oauth2', False) %} diff --git a/roles/cmp-db-docker/README.md b/roles/sys-stk-back-stateful/README.md similarity index 61% rename from roles/cmp-db-docker/README.md rename to roles/sys-stk-back-stateful/README.md index 7e1e4e25..dbf354e3 100644 --- a/roles/cmp-db-docker/README.md +++ b/roles/sys-stk-back-stateful/README.md @@ -1,18 +1,18 @@ # Database Docker Composition -This role combines the central RDBMS role (`cmp-rdbms`) with Docker Compose to deliver a ready-to-use containerized database environment. +This role combines the central RDBMS role (`sys-svc-rdbms`) with Docker Compose to deliver a ready-to-use containerized database environment. ## Features - **Central RDBMS Integration** - Includes the `cmp-rdbms` role, which handles backups, restores, user and permission management for your relational database system (PostgreSQL, MariaDB, etc.). + Includes the `sys-svc-rdbms` role, which handles backups, restores, user and permission management for your relational database system (PostgreSQL, MariaDB, etc.). - **Docker Compose** Utilizes the standalone `docker-compose` role to define and bring up containers, networks, and volumes automatically. - **Variable Load Order** 1. Docker Compose variables (`roles/docker-compose/vars/docker-compose.yml`) - 2. Database variables (`roles/cmp-rdbms/vars/database.yml`) + 2. Database variables (`roles/sys-svc-rdbms/vars/database.yml`) Ensures compose ports and volumes are defined before the database role consumes them. The role will load both sub-roles and satisfy all dependencies transparently. @@ -22,4 +22,4 @@ The role will load both sub-roles and satisfy all dependencies transparently. 1. **Set Fact** `database_application_id` to work around lazy‐loading ordering. 2. **Include Vars** in the specified order. 3. **Invoke** `docker-compose` role to create containers, networks, and volumes. -4. **Invoke** `cmp-rdbms` role to provision the database, backups, and users. \ No newline at end of file +4. **Invoke** `sys-svc-rdbms` role to provision the database, backups, and users. \ No newline at end of file diff --git a/roles/cmp-db-docker/meta/main.yml b/roles/sys-stk-back-stateful/meta/main.yml similarity index 100% rename from roles/cmp-db-docker/meta/main.yml rename to roles/sys-stk-back-stateful/meta/main.yml diff --git a/roles/cmp-db-docker/tasks/main.yml b/roles/sys-stk-back-stateful/tasks/main.yml similarity index 77% rename from roles/cmp-db-docker/tasks/main.yml rename to roles/sys-stk-back-stateful/tasks/main.yml index b0569e1a..3aa70e02 100644 --- a/roles/cmp-db-docker/tasks/main.yml +++ b/roles/sys-stk-back-stateful/tasks/main.yml @@ -1,4 +1,4 @@ -# run_once_cmp_db_docker: disabled +# run_once_sys_stk_back_stateful: disabled - name: "For '{{ application_id }}': Set database_application_id (Needed due to lazzy loading issue)" set_fact: @@ -12,8 +12,8 @@ - name: "For '{{ application_id }}': Load central RDBMS" include_role: - name: cmp-rdbms + name: sys-svc-rdbms -- name: "For '{{ application_id }}': Load cmp-docker-oauth2" +- name: "For '{{ application_id }}': Load sys-stk-back-stateless" include_role: - name: cmp-docker-oauth2 \ No newline at end of file + name: sys-stk-back-stateless \ No newline at end of file diff --git a/roles/sys-stk-back-stateful/vars/main.yml b/roles/sys-stk-back-stateful/vars/main.yml new file mode 100644 index 00000000..1a24c649 --- /dev/null +++ b/roles/sys-stk-back-stateful/vars/main.yml @@ -0,0 +1 @@ +DATABASE_VARS_FILE: "{{ playbook_dir }}/roles/sys-svc-rdbms/vars/database.yml" \ No newline at end of file diff --git a/roles/cmp-docker-oauth2/README.md b/roles/sys-stk-back-stateless/README.md similarity index 96% rename from roles/cmp-docker-oauth2/README.md rename to roles/sys-stk-back-stateless/README.md index ac05ded8..e06db456 100644 --- a/roles/cmp-docker-oauth2/README.md +++ b/roles/sys-stk-back-stateless/README.md @@ -1,4 +1,4 @@ -# cmp-docker-oauth2 +# sys-stk-back-stateless This Ansible role enhances a Docker Compose application by conditionally enabling OAuth2-based authentication. It ensures that the `docker-compose` role is always loaded, and if the application has OAuth2 support enabled via `features.oauth2`, it also configures the OAuth2 proxy. diff --git a/roles/cmp-docker-oauth2/defaults/main.yml b/roles/sys-stk-back-stateless/defaults/main.yml similarity index 100% rename from roles/cmp-docker-oauth2/defaults/main.yml rename to roles/sys-stk-back-stateless/defaults/main.yml diff --git a/roles/cmp-docker-oauth2/meta/main.yml b/roles/sys-stk-back-stateless/meta/main.yml similarity index 100% rename from roles/cmp-docker-oauth2/meta/main.yml rename to roles/sys-stk-back-stateless/meta/main.yml diff --git a/roles/cmp-docker-oauth2/tasks/main.yml b/roles/sys-stk-back-stateless/tasks/main.yml similarity index 93% rename from roles/cmp-docker-oauth2/tasks/main.yml rename to roles/sys-stk-back-stateless/tasks/main.yml index f3eba447..abee8fa8 100644 --- a/roles/cmp-docker-oauth2/tasks/main.yml +++ b/roles/sys-stk-back-stateless/tasks/main.yml @@ -1,4 +1,4 @@ -# run_once_cmp_docker_oauth2: disabled +# run_once_sys_stk_back_stateless: disabled - name: "For '{{ application_id }}': Load docker-compose" include_role: diff --git a/roles/srv-domain-provision/README.md b/roles/sys-stk-front/README.md similarity index 93% rename from roles/srv-domain-provision/README.md rename to roles/sys-stk-front/README.md index e88e68f4..7c6e1543 100644 --- a/roles/srv-domain-provision/README.md +++ b/roles/sys-stk-front/README.md @@ -6,7 +6,7 @@ This role bootstraps **per-domain Nginx configuration**: it requests TLS certifi ## Overview -A higher-level orchestration wrapper, *srv-domain-provision* ties together several lower-level roles: +A higher-level orchestration wrapper, *sys-stk-front* ties together several lower-level roles: 1. **`sys-srv-web-inj-compose`** – applies global tweaks and includes. 2. **`srv-tls-core`** – obtains Let’s Encrypt certificates. diff --git a/roles/srv-domain-provision/defaults/main.yml b/roles/sys-stk-front/defaults/main.yml similarity index 100% rename from roles/srv-domain-provision/defaults/main.yml rename to roles/sys-stk-front/defaults/main.yml diff --git a/roles/srv-domain-provision/meta/main.yml b/roles/sys-stk-front/meta/main.yml similarity index 100% rename from roles/srv-domain-provision/meta/main.yml rename to roles/sys-stk-front/meta/main.yml diff --git a/roles/srv-domain-provision/tasks/01_cloudflare.yml b/roles/sys-stk-front/tasks/01_cloudflare.yml similarity index 100% rename from roles/srv-domain-provision/tasks/01_cloudflare.yml rename to roles/sys-stk-front/tasks/01_cloudflare.yml diff --git a/roles/srv-domain-provision/tasks/cloudflare/01_cleanup.yml b/roles/sys-stk-front/tasks/cloudflare/01_cleanup.yml similarity index 100% rename from roles/srv-domain-provision/tasks/cloudflare/01_cleanup.yml rename to roles/sys-stk-front/tasks/cloudflare/01_cleanup.yml diff --git a/roles/srv-domain-provision/tasks/cloudflare/02_enable_cf_dev_mode.yml b/roles/sys-stk-front/tasks/cloudflare/02_enable_cf_dev_mode.yml similarity index 95% rename from roles/srv-domain-provision/tasks/cloudflare/02_enable_cf_dev_mode.yml rename to roles/sys-stk-front/tasks/cloudflare/02_enable_cf_dev_mode.yml index 1f4d79af..5351624d 100644 --- a/roles/srv-domain-provision/tasks/cloudflare/02_enable_cf_dev_mode.yml +++ b/roles/sys-stk-front/tasks/cloudflare/02_enable_cf_dev_mode.yml @@ -1,4 +1,3 @@ -# roles/srv-domain-provision/tasks/02_enable_cf_dev_mode.yml --- # Enables Cloudflare Development Mode (bypasses cache for ~3 hours). # Uses the same auth token as in 01_cleanup.yml: CLOUDFLARE_API_TOKEN diff --git a/roles/srv-domain-provision/tasks/main.yml b/roles/sys-stk-front/tasks/main.yml similarity index 95% rename from roles/srv-domain-provision/tasks/main.yml rename to roles/sys-stk-front/tasks/main.yml index eb784d02..02b75669 100644 --- a/roles/srv-domain-provision/tasks/main.yml +++ b/roles/sys-stk-front/tasks/main.yml @@ -4,7 +4,7 @@ name: srv-proxy-core when: run_once_srv_proxy_core is not defined - include_tasks: utils/run_once.yml - when: run_once_srv_domain_provision is not defined + when: run_once_sys_stk_front is not defined - include_tasks: "01_cloudflare.yml" when: DNS_PROVIDER == "cloudflare" diff --git a/roles/srv-domain-provision/vars/main.yml b/roles/sys-stk-front/vars/main.yml similarity index 100% rename from roles/srv-domain-provision/vars/main.yml rename to roles/sys-stk-front/vars/main.yml diff --git a/roles/sys-stk-full-stateful/README.md b/roles/sys-stk-full-stateful/README.md new file mode 100644 index 00000000..4f859169 --- /dev/null +++ b/roles/sys-stk-full-stateful/README.md @@ -0,0 +1,11 @@ +# Database Docker with Web Proxy + +This role builds on `sys-stk-back-stateful` by adding a reverse-proxy frontend for HTTP access to your database service. + +## Features + +- **Database Composition** + Leverages the `sys-stk-back-stateful` role to stand up your containerized database (PostgreSQL, MariaDB, etc.) with backups and user management. + +- **Reverse Proxy** + Includes the `sys-stk-front` role to configure a proxy (e.g. nginx) for routing HTTP(S) traffic to your database UI or management endpoint. \ No newline at end of file diff --git a/roles/cmp-db-docker-proxy/meta/main.yml b/roles/sys-stk-full-stateful/meta/main.yml similarity index 79% rename from roles/cmp-db-docker-proxy/meta/main.yml rename to roles/sys-stk-full-stateful/meta/main.yml index a53be4e1..1f39ec9d 100644 --- a/roles/cmp-db-docker-proxy/meta/main.yml +++ b/roles/sys-stk-full-stateful/meta/main.yml @@ -1,7 +1,7 @@ galaxy_info: author: "Kevin Veen-Birkenbach" description: > - Extends cmp-db-docker by adding an HTTP reverse proxy via srv-domain-provision. + Extends sys-stk-back-stateful by adding an HTTP reverse proxy via sys-stk-front. company: | Kevin Veen-Birkenbach Consulting & Coaching Solutions diff --git a/roles/cmp-db-docker-proxy/tasks/main.yml b/roles/sys-stk-full-stateful/tasks/main.yml similarity index 66% rename from roles/cmp-db-docker-proxy/tasks/main.yml rename to roles/sys-stk-full-stateful/tasks/main.yml index 4414c440..a583cbfd 100644 --- a/roles/cmp-db-docker-proxy/tasks/main.yml +++ b/roles/sys-stk-full-stateful/tasks/main.yml @@ -1,16 +1,16 @@ -# run_once_cmp_db_docker_proxy: deactivated +# run_once_sys_stk_full_stateful: deactivated - include_tasks: "{{ playbook_dir }}/tasks/utils/load_handlers.yml" vars: handler_role_name: "svc-prx-openresty" -- name: "For '{{ application_id }}': load docker and db" +- name: "For '{{ application_id }}': include role sys-stk-front" include_role: - name: cmp-db-docker - -- name: "For '{{ application_id }}': include role srv-domain-provision" - include_role: - name: srv-domain-provision + name: sys-stk-front vars: domain: "{{ domains | get_domain(application_id) }}" http_port: "{{ ports.localhost.http[application_id] }}" + +- name: "For '{{ application_id }}': load docker and db" + include_role: + name: sys-stk-back-stateful diff --git a/roles/cmp-docker-proxy/README.md b/roles/sys-stk-full-stateless/README.md similarity index 73% rename from roles/cmp-docker-proxy/README.md rename to roles/sys-stk-full-stateless/README.md index 07e93906..7fe1ee98 100644 --- a/roles/cmp-docker-proxy/README.md +++ b/roles/sys-stk-full-stateless/README.md @@ -8,4 +8,4 @@ This role combines the standard Docker Compose setup with a reverse-proxy for an Brings up containers, networks, and volumes via the `docker-compose` role. - **Reverse Proxy** - Uses the `srv-domain-provision` role to expose your application under a custom domain and port. + Uses the `sys-stk-front` role to expose your application under a custom domain and port. diff --git a/roles/cmp-docker-proxy/meta/main.yml b/roles/sys-stk-full-stateless/meta/main.yml similarity index 84% rename from roles/cmp-docker-proxy/meta/main.yml rename to roles/sys-stk-full-stateless/meta/main.yml index 1ee278ca..7afaf086 100644 --- a/roles/cmp-docker-proxy/meta/main.yml +++ b/roles/sys-stk-full-stateless/meta/main.yml @@ -1,7 +1,7 @@ galaxy_info: author: "Kevin Veen-Birkenbach" description: > - Combines the docker-compose role with srv-domain-provision to + Combines the docker-compose role with sys-stk-front to deploy applications behind a reverse proxy. company: | Kevin Veen-Birkenbach diff --git a/roles/cmp-docker-proxy/tasks/main.yml b/roles/sys-stk-full-stateless/tasks/main.yml similarity index 52% rename from roles/cmp-docker-proxy/tasks/main.yml rename to roles/sys-stk-full-stateless/tasks/main.yml index 728c636b..a57d3503 100644 --- a/roles/cmp-docker-proxy/tasks/main.yml +++ b/roles/sys-stk-full-stateless/tasks/main.yml @@ -1,14 +1,13 @@ -# run_once_cmp_docker_proxy: deactivated +# run_once_sys_stk_full_stateless: deactivated # Load the proxy first, so that openresty handlers are flushed before the main docker compose -- name: "For '{{ application_id }}': include role srv-domain-provision" +- name: "For '{{ application_id }}': include role sys-stk-front" include_role: - name: srv-domain-provision + name: sys-stk-front vars: domain: "{{ domains | get_domain(application_id) }}" http_port: "{{ ports.localhost.http[application_id] }}" -- name: "For '{{ application_id }}': Load cmp-docker-oauth2" +- name: "For '{{ application_id }}': Load sys-stk-back-stateless" include_role: - name: cmp-docker-oauth2 - + name: sys-stk-back-stateless diff --git a/roles/cmp-rdbms/README.md b/roles/sys-svc-rdbms/README.md similarity index 100% rename from roles/cmp-rdbms/README.md rename to roles/sys-svc-rdbms/README.md diff --git a/roles/cmp-rdbms/meta/main.yml b/roles/sys-svc-rdbms/meta/main.yml similarity index 100% rename from roles/cmp-rdbms/meta/main.yml rename to roles/sys-svc-rdbms/meta/main.yml diff --git a/roles/cmp-rdbms/tasks/main.yml b/roles/sys-svc-rdbms/tasks/main.yml similarity index 96% rename from roles/cmp-rdbms/tasks/main.yml rename to roles/sys-svc-rdbms/tasks/main.yml index 29633cff..5961544f 100644 --- a/roles/cmp-rdbms/tasks/main.yml +++ b/roles/sys-svc-rdbms/tasks/main.yml @@ -1,4 +1,4 @@ -# run_once_cmp_rdbms: deactivated +# run_once_sys_svc_rdbms: deactivated # The following env file will just be used from the dedicated mariadb container # and not the central one diff --git a/roles/cmp-rdbms/templates/configuration.yml.j2 b/roles/sys-svc-rdbms/templates/configuration.yml.j2 similarity index 100% rename from roles/cmp-rdbms/templates/configuration.yml.j2 rename to roles/sys-svc-rdbms/templates/configuration.yml.j2 diff --git a/roles/cmp-rdbms/templates/env/mariadb.env.j2 b/roles/sys-svc-rdbms/templates/env/mariadb.env.j2 similarity index 100% rename from roles/cmp-rdbms/templates/env/mariadb.env.j2 rename to roles/sys-svc-rdbms/templates/env/mariadb.env.j2 diff --git a/roles/cmp-rdbms/templates/env/postgres.env.j2 b/roles/sys-svc-rdbms/templates/env/postgres.env.j2 similarity index 100% rename from roles/cmp-rdbms/templates/env/postgres.env.j2 rename to roles/sys-svc-rdbms/templates/env/postgres.env.j2 diff --git a/roles/sys-svc-rdbms/templates/services/main.yml.j2 b/roles/sys-svc-rdbms/templates/services/main.yml.j2 new file mode 100644 index 00000000..60494351 --- /dev/null +++ b/roles/sys-svc-rdbms/templates/services/main.yml.j2 @@ -0,0 +1 @@ +{% include 'roles/sys-svc-rdbms/templates/services/' + database_type + '.yml.j2' %} \ No newline at end of file diff --git a/roles/cmp-rdbms/templates/services/mariadb.yml.j2 b/roles/sys-svc-rdbms/templates/services/mariadb.yml.j2 similarity index 100% rename from roles/cmp-rdbms/templates/services/mariadb.yml.j2 rename to roles/sys-svc-rdbms/templates/services/mariadb.yml.j2 diff --git a/roles/cmp-rdbms/templates/services/postgres.yml.j2 b/roles/sys-svc-rdbms/templates/services/postgres.yml.j2 similarity index 100% rename from roles/cmp-rdbms/templates/services/postgres.yml.j2 rename to roles/sys-svc-rdbms/templates/services/postgres.yml.j2 diff --git a/roles/cmp-rdbms/vars/database.yml b/roles/sys-svc-rdbms/vars/database.yml similarity index 100% rename from roles/cmp-rdbms/vars/database.yml rename to roles/sys-svc-rdbms/vars/database.yml diff --git a/roles/cmp-rdbms/vars/main.yml b/roles/sys-svc-rdbms/vars/main.yml similarity index 100% rename from roles/cmp-rdbms/vars/main.yml rename to roles/sys-svc-rdbms/vars/main.yml diff --git a/roles/web-app-akaunting/tasks/main.yml b/roles/web-app-akaunting/tasks/main.yml index c582c9e6..ac6a0b2e 100644 --- a/roles/web-app-akaunting/tasks/main.yml +++ b/roles/web-app-akaunting/tasks/main.yml @@ -10,7 +10,7 @@ - name: "For '{{ application_id }}': load docker, db and proxy" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: # Forward flag into compose templating cmp_extra_facts: diff --git a/roles/web-app-attendize/tasks/main.yml b/roles/web-app-attendize/tasks/main.yml index 43be8b1e..7492a8e5 100644 --- a/roles/web-app-attendize/tasks/main.yml +++ b/roles/web-app-attendize/tasks/main.yml @@ -11,7 +11,7 @@ - name: "For '{{ application_id }}': load docker and db" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-baserow/tasks/main.yml b/roles/web-app-baserow/tasks/main.yml index e185e3dd..3dc4a43f 100644 --- a/roles/web-app-baserow/tasks/main.yml +++ b/roles/web-app-baserow/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "For '{{ application_id }}': load docker, db and proxy" include_role: - name: cmp-db-docker-proxy \ No newline at end of file + name: sys-stk-full-stateful \ No newline at end of file diff --git a/roles/web-app-bigbluebutton/tasks/main.yml b/roles/web-app-bigbluebutton/tasks/main.yml index a6c9d133..7e398517 100644 --- a/roles/web-app-bigbluebutton/tasks/main.yml +++ b/roles/web-app-bigbluebutton/tasks/main.yml @@ -11,7 +11,7 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless vars: docker_compose_flush_handlers: false - name: "include 04_seed-database-to-backup.yml" diff --git a/roles/web-app-bluesky/tasks/main.yml b/roles/web-app-bluesky/tasks/main.yml index 497021a8..0cc942b3 100644 --- a/roles/web-app-bluesky/tasks/main.yml +++ b/roles/web-app-bluesky/tasks/main.yml @@ -2,9 +2,9 @@ include_role: name: docker-compose -- name: "include role srv-domain-provision for {{ application_id }}" +- name: "include role sys-stk-front for {{ application_id }}" include_role: - name: srv-domain-provision + name: sys-stk-front vars: domain: "{{ item.domain }}" http_port: "{{ item.http_port }}" diff --git a/roles/web-app-desktop/tasks/01_core.yml b/roles/web-app-desktop/tasks/01_core.yml index bd51b5bf..1707571d 100644 --- a/roles/web-app-desktop/tasks/01_core.yml +++ b/roles/web-app-desktop/tasks/01_core.yml @@ -7,7 +7,7 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless - name: "Check if host-specific config.yaml exists in {{ DESKTOP_INVENTORY_CONFIG_PATH }}" stat: diff --git a/roles/web-app-discourse/tasks/02_reset.yml b/roles/web-app-discourse/tasks/02_reset.yml index b5d75a96..4ea0e20f 100644 --- a/roles/web-app-discourse/tasks/02_reset.yml +++ b/roles/web-app-discourse/tasks/02_reset.yml @@ -6,7 +6,7 @@ file: "{{ item }}" loop: - "{{ playbook_dir }}/roles/docker-compose/vars/docker-compose.yml" - - "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml" + - "{{ playbook_dir }}/roles/sys-svc-rdbms/vars/database.yml" - name: Sanity check for required vars assert: diff --git a/roles/web-app-discourse/tasks/03_docker.yml b/roles/web-app-discourse/tasks/03_docker.yml index f27305ed..0c6dd3cb 100644 --- a/roles/web-app-discourse/tasks/03_docker.yml +++ b/roles/web-app-discourse/tasks/03_docker.yml @@ -6,7 +6,7 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-elk/tasks/main.yml b/roles/web-app-elk/tasks/main.yml index 3d04767d..3bd3b84b 100644 --- a/roles/web-app-elk/tasks/main.yml +++ b/roles/web-app-elk/tasks/main.yml @@ -1,8 +1,8 @@ --- -- name: "include role srv-domain-provision for {{ application_id }}" +- name: "include role sys-stk-front for {{ application_id }}" include_role: - name: srv-domain-provision + name: sys-stk-front vars: domain: "{{ domains | get_domain(application_id) }}" http_port: "{{ ports.localhost.http[application_id] }}" diff --git a/roles/web-app-espocrm/README.md b/roles/web-app-espocrm/README.md index 53aad6dd..fa6f90ad 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 `cmp-rdbms` role +- MariaDB database provisioning via the `sys-svc-rdbms` 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 f228341b..8f1ae73d 100644 --- a/roles/web-app-espocrm/tasks/main.yml +++ b/roles/web-app-espocrm/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-friendica/tasks/main.yml b/roles/web-app-friendica/tasks/main.yml index 546cd45e..216f002e 100644 --- a/roles/web-app-friendica/tasks/main.yml +++ b/roles/web-app-friendica/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: Integrate LDAP include_tasks: 01_ldap.yml diff --git a/roles/web-app-funkwhale/tasks/main.yml b/roles/web-app-funkwhale/tasks/main.yml index b0a77e2a..8b84efd0 100644 --- a/roles/web-app-funkwhale/tasks/main.yml +++ b/roles/web-app-funkwhale/tasks/main.yml @@ -1,6 +1,6 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-app-fusiondirectory/README.md b/roles/web-app-fusiondirectory/README.md index 445766e7..5596889c 100644 --- a/roles/web-app-fusiondirectory/README.md +++ b/roles/web-app-fusiondirectory/README.md @@ -9,7 +9,7 @@ This Ansible role deploys and configures [FusionDirectory](https://www.fusiondir - Loads and templating of FusionDirectory-specific variables - Generates a `.env` file for the container environment - Deploys the FusionDirectory container via Docker Compose -- Configures NGINX (via the `srv-domain-provision` role) to expose the service +- Configures NGINX (via the `sys-stk-front` role) to expose the service - Integrates with your central LDAP server for authentication ## Features diff --git a/roles/web-app-fusiondirectory/tasks/main.yml b/roles/web-app-fusiondirectory/tasks/main.yml index 675d0745..9e32bc73 100644 --- a/roles/web-app-fusiondirectory/tasks/main.yml +++ b/roles/web-app-fusiondirectory/tasks/main.yml @@ -1,3 +1,3 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-app-gitea/tasks/main.yml b/roles/web-app-gitea/tasks/main.yml index ef4396a0..a2bd7375 100644 --- a/roles/web-app-gitea/tasks/main.yml +++ b/roles/web-app-gitea/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: Wait for Gitea HTTP endpoint wait_for: diff --git a/roles/web-app-gitlab/tasks/main.yml b/roles/web-app-gitlab/tasks/main.yml index 5278a660..07006289 100644 --- a/roles/web-app-gitlab/tasks/main.yml +++ b/roles/web-app-gitlab/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-app-jenkins/tasks/main.yml b/roles/web-app-jenkins/tasks/main.yml index b66886f5..47deddd1 100644 --- a/roles/web-app-jenkins/tasks/main.yml +++ b/roles/web-app-jenkins/tasks/main.yml @@ -1,4 +1,4 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-app-joomla/README.md b/roles/web-app-joomla/README.md index 88c14803..53db508f 100644 --- a/roles/web-app-joomla/README.md +++ b/roles/web-app-joomla/README.md @@ -1,4 +1,4 @@ -# Joomla CMS +# Joomla ## Description diff --git a/roles/web-app-joomla/tasks/main.yml b/roles/web-app-joomla/tasks/main.yml index 8892fd84..d0f3a812 100644 --- a/roles/web-app-joomla/tasks/main.yml +++ b/roles/web-app-joomla/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "Include role srv-domain-provision for {{ application_id }}" +- name: "Include role sys-stk-front for {{ application_id }}" include_role: - name: srv-domain-provision + name: sys-stk-front loop: "{{ JOOMLA_DOMAINS }}" loop_control: loop_var: domain @@ -10,7 +10,7 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-keycloak/tasks/01_meta.yml b/roles/web-app-keycloak/tasks/01_meta.yml index ae4caa73..76a225d9 100644 --- a/roles/web-app-keycloak/tasks/01_meta.yml +++ b/roles/web-app-keycloak/tasks/01_meta.yml @@ -5,4 +5,4 @@ file: "{{ item }}" loop: - "{{ playbook_dir }}/roles/docker-compose/vars/docker-compose.yml" - - "{{ playbook_dir }}/roles/cmp-rdbms/vars/database.yml" \ No newline at end of file + - "{{ playbook_dir }}/roles/sys-svc-rdbms/vars/database.yml" \ No newline at end of file diff --git a/roles/web-app-keycloak/tasks/04_dependencies.yml b/roles/web-app-keycloak/tasks/04_dependencies.yml index 2ec67abd..109c3d8d 100644 --- a/roles/web-app-keycloak/tasks/04_dependencies.yml +++ b/roles/web-app-keycloak/tasks/04_dependencies.yml @@ -7,6 +7,6 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-lam/tasks/main.yml b/roles/web-app-lam/tasks/main.yml index a769b271..7c6ca11e 100644 --- a/roles/web-app-lam/tasks/main.yml +++ b/roles/web-app-lam/tasks/main.yml @@ -1,3 +1,3 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless diff --git a/roles/web-app-listmonk/tasks/main.yml b/roles/web-app-listmonk/tasks/main.yml index 9b705b4f..03ed211b 100644 --- a/roles/web-app-listmonk/tasks/main.yml +++ b/roles/web-app-listmonk/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: proxy_extra_configuration: >- {% if not applications | get_app_conf(application_id, 'public_api_activated', True) %} diff --git a/roles/web-app-mailu/tasks/01_core.yml b/roles/web-app-mailu/tasks/01_core.yml index a3dc82e5..5e707514 100644 --- a/roles/web-app-mailu/tasks/01_core.yml +++ b/roles/web-app-mailu/tasks/01_core.yml @@ -27,7 +27,7 @@ block: - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-mastodon/tasks/main.yml b/roles/web-app-mastodon/tasks/main.yml index 2284aff9..602778e8 100644 --- a/roles/web-app-mastodon/tasks/main.yml +++ b/roles/web-app-mastodon/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "Include setup for domain '{{ domain }}'" include_role: - name: srv-domain-provision + name: sys-stk-front loop: "{{ domains['web-app-mastodon'] }}" loop_control: loop_var: domain @@ -14,7 +14,7 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful vars: docker_compose_flush_handlers: true diff --git a/roles/web-app-matomo/tasks/01_core.yml b/roles/web-app-matomo/tasks/01_core.yml index 328c82f8..eb097258 100644 --- a/roles/web-app-matomo/tasks/01_core.yml +++ b/roles/web-app-matomo/tasks/01_core.yml @@ -1,6 +1,6 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: "Patch Matomo config.ini.php" include_tasks: 02_configuration.yml diff --git a/roles/web-app-matrix/tasks/01_docker.yml b/roles/web-app-matrix/tasks/01_docker.yml index 5013f16d..497ed7f9 100644 --- a/roles/web-app-matrix/tasks/01_docker.yml +++ b/roles/web-app-matrix/tasks/01_docker.yml @@ -1,6 +1,6 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-matrix/tasks/03_webserver.yml b/roles/web-app-matrix/tasks/03_webserver.yml index b3f93157..bfb77ef3 100644 --- a/roles/web-app-matrix/tasks/03_webserver.yml +++ b/roles/web-app-matrix/tasks/03_webserver.yml @@ -9,9 +9,9 @@ src: "well-known.j2" dest: "{{ MATRIX_WELL_KNOWN_FILE }}" -- name: "include role srv-domain-provision for {{ MATRIX_ELEMENT_DOMAIN }}" +- name: "include role sys-stk-front for {{ MATRIX_ELEMENT_DOMAIN }}" include_role: - name: srv-domain-provision + name: sys-stk-front vars: domain: "{{ MATRIX_ELEMENT_DOMAIN }}" http_port: "{{ MATRIX_ELEMENT_PORT }}" diff --git a/roles/web-app-mediawiki/tasks/main.yml b/roles/web-app-mediawiki/tasks/main.yml index 909beaf2..a8f78fae 100644 --- a/roles/web-app-mediawiki/tasks/main.yml +++ b/roles/web-app-mediawiki/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-mig/tasks/01_core.yml b/roles/web-app-mig/tasks/01_core.yml index 9e2b77be..4c6d5883 100644 --- a/roles/web-app-mig/tasks/01_core.yml +++ b/roles/web-app-mig/tasks/01_core.yml @@ -18,7 +18,7 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless - name: Build data (single async task) include_tasks: 02_build_data.yml diff --git a/roles/web-app-mobilizon/tasks/main.yml b/roles/web-app-mobilizon/tasks/main.yml index 60e1b0c2..c5704255 100644 --- a/roles/web-app-mobilizon/tasks/main.yml +++ b/roles/web-app-mobilizon/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: add config.exs template: diff --git a/roles/web-app-moodle/tasks/main.yml b/roles/web-app-moodle/tasks/main.yml index 55373bd8..5562e0e4 100644 --- a/roles/web-app-moodle/tasks/main.yml +++ b/roles/web-app-moodle/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: Check if config.php exists command: docker exec --user root {{ moodle_container }} test -f {{ moodle_config }} diff --git a/roles/web-app-mybb/tasks/main.yml b/roles/web-app-mybb/tasks/main.yml index d760c80b..cb3719aa 100644 --- a/roles/web-app-mybb/tasks/main.yml +++ b/roles/web-app-mybb/tasks/main.yml @@ -1,6 +1,6 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false proxy_extra_configuration: "sub_filter '{{MYBB_DOMAIN}}' '{{ MYBB_DOMAIN }}';" diff --git a/roles/web-app-navigator/tasks/main.yml b/roles/web-app-navigator/tasks/main.yml index 13b6ecfa..ce12d4f5 100644 --- a/roles/web-app-navigator/tasks/main.yml +++ b/roles/web-app-navigator/tasks/main.yml @@ -16,7 +16,7 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless # Hack because it wasn't possible to fix an handler bug in pkgmgr install - name: „Trigger“ docker compose up diff --git a/roles/web-app-nextcloud/tasks/main.yml b/roles/web-app-nextcloud/tasks/main.yml index 129b26f7..f0950e44 100644 --- a/roles/web-app-nextcloud/tasks/main.yml +++ b/roles/web-app-nextcloud/tasks/main.yml @@ -21,7 +21,7 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-openproject/tasks/main.yml b/roles/web-app-openproject/tasks/main.yml index d91f89d3..ec11d171 100644 --- a/roles/web-app-openproject/tasks/main.yml +++ b/roles/web-app-openproject/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: "Create {{ openproject_plugins_folder }}" file: diff --git a/roles/web-app-peertube/tasks/main.yml b/roles/web-app-peertube/tasks/main.yml index 261a34c6..6a2923ab 100644 --- a/roles/web-app-peertube/tasks/main.yml +++ b/roles/web-app-peertube/tasks/main.yml @@ -11,7 +11,7 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful - name: "Install and activate auth-openid-connect plugin if OIDC is enabled" include_tasks: enable-oidc.yml diff --git a/roles/web-app-pgadmin/tasks/main.yml b/roles/web-app-pgadmin/tasks/main.yml index 125d4dba..6f333631 100644 --- a/roles/web-app-pgadmin/tasks/main.yml +++ b/roles/web-app-pgadmin/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless - name: "configure pgadmin servers" include_tasks: configuration.yml diff --git a/roles/web-app-phpldapadmin/tasks/main.yml b/roles/web-app-phpldapadmin/tasks/main.yml index ad73b756..7530f28e 100644 --- a/roles/web-app-phpldapadmin/tasks/main.yml +++ b/roles/web-app-phpldapadmin/tasks/main.yml @@ -1,3 +1,3 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy \ No newline at end of file + name: sys-stk-full-stateless \ No newline at end of file diff --git a/roles/web-app-phpmyadmin/tasks/main.yml b/roles/web-app-phpmyadmin/tasks/main.yml index 1339daae..4c7346cc 100644 --- a/roles/web-app-phpmyadmin/tasks/main.yml +++ b/roles/web-app-phpmyadmin/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless diff --git a/roles/web-app-pixelfed/tasks/main.yml b/roles/web-app-pixelfed/tasks/main.yml index 5278a660..07006289 100644 --- a/roles/web-app-pixelfed/tasks/main.yml +++ b/roles/web-app-pixelfed/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-app-pretix/tasks/main.yml b/roles/web-app-pretix/tasks/main.yml index 7369fdcd..3d520d16 100644 --- a/roles/web-app-pretix/tasks/main.yml +++ b/roles/web-app-pretix/tasks/main.yml @@ -2,6 +2,6 @@ - block: - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful - include_tasks: utils/run_once.yml when: run_once_web_app_pretix is not defined diff --git a/roles/web-app-snipe-it/tasks/main.yml b/roles/web-app-snipe-it/tasks/main.yml index c1f1107d..1774723c 100644 --- a/roles/web-app-snipe-it/tasks/main.yml +++ b/roles/web-app-snipe-it/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful - name: "Configure Snipe-IT LDAP settings" import_tasks: ldap.yml diff --git a/roles/web-app-sphinx/tasks/main.yml b/roles/web-app-sphinx/tasks/main.yml index e75ebc17..d833b34e 100644 --- a/roles/web-app-sphinx/tasks/main.yml +++ b/roles/web-app-sphinx/tasks/main.yml @@ -15,7 +15,7 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless # Hack because it wasn't possible to fix an handler bug in pkgmgr install - name: „Trigger“ docker compose up diff --git a/roles/web-app-syncope/tasks/main.yml b/roles/web-app-syncope/tasks/main.yml index 98aad797..c2e41f6d 100644 --- a/roles/web-app-syncope/tasks/main.yml +++ b/roles/web-app-syncope/tasks/main.yml @@ -5,7 +5,7 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful - name: configure {{ domain }}.conf template: diff --git a/roles/web-app-taiga/README.md b/roles/web-app-taiga/README.md index 30bff843..b52348df 100644 --- a/roles/web-app-taiga/README.md +++ b/roles/web-app-taiga/README.md @@ -39,7 +39,7 @@ By using this role, teams can set up Taiga in minutes on Arch Linux systems — - [taiga-contrib-oidc-auth (official)](https://github.com/taigaio/taiga-contrib-oidc-auth) - 📨 **Email Backend:** Supports SMTP and console backends for development. - 🔁 **Async & Realtime Events:** Includes RabbitMQ and support for Taiga’s event system. -- 🌐 **Reverse Proxy Ready:** Integrates with Nginx using the `srv-domain-provision` role. +- 🌐 **Reverse Proxy Ready:** Integrates with Nginx using the `sys-stk-front` role. - 🧩 **Composable Design:** Integrates cleanly with other Infinito.Nexus infrastructure roles. --- diff --git a/roles/web-app-taiga/tasks/main.yml b/roles/web-app-taiga/tasks/main.yml index c17ca8da..19cd9747 100644 --- a/roles/web-app-taiga/tasks/main.yml +++ b/roles/web-app-taiga/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-wordpress/tasks/main.yml b/roles/web-app-wordpress/tasks/main.yml index 9e9fd95f..8539d928 100644 --- a/roles/web-app-wordpress/tasks/main.yml +++ b/roles/web-app-wordpress/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "Include role srv-domain-provision for {{ application_id }}" +- name: "Include role sys-stk-front for {{ application_id }}" include_role: - name: srv-domain-provision + name: sys-stk-front loop: "{{ WORDPRESS_DOMAINS }}" loop_control: loop_var: domain @@ -11,7 +11,7 @@ - name: "load docker and db for {{ application_id }}" include_role: - name: cmp-db-docker + name: sys-stk-back-stateful vars: docker_compose_flush_handlers: false diff --git a/roles/web-app-yourls/tasks/main.yml b/roles/web-app-yourls/tasks/main.yml index 859e503f..2f8a5044 100644 --- a/roles/web-app-yourls/tasks/main.yml +++ b/roles/web-app-yourls/tasks/main.yml @@ -1,5 +1,5 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-svc-collabora/tasks/01_core.yml b/roles/web-svc-collabora/tasks/01_core.yml index cdd35672..4f0612d4 100644 --- a/roles/web-svc-collabora/tasks/01_core.yml +++ b/roles/web-svc-collabora/tasks/01_core.yml @@ -1,6 +1,6 @@ - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless public: true vars: docker_compose_flush_handlers: true diff --git a/roles/web-svc-coturn/tasks/main.yml b/roles/web-svc-coturn/tasks/main.yml index 5278a660..07006289 100644 --- a/roles/web-svc-coturn/tasks/main.yml +++ b/roles/web-svc-coturn/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful diff --git a/roles/web-svc-libretranslate/tasks/main.yml b/roles/web-svc-libretranslate/tasks/main.yml index 1ac28d42..04676c3c 100644 --- a/roles/web-svc-libretranslate/tasks/main.yml +++ b/roles/web-svc-libretranslate/tasks/main.yml @@ -1,6 +1,6 @@ - name: "load docker, db and proxy for {{ application_id }}" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful when: run_once_web_app_libretranslate is not defined - name: run the libretranslate tasks once diff --git a/roles/web-svc-logout/tasks/main.yml b/roles/web-svc-logout/tasks/main.yml index 9cc61c4e..2fdf8c33 100644 --- a/roles/web-svc-logout/tasks/main.yml +++ b/roles/web-svc-logout/tasks/main.yml @@ -2,7 +2,7 @@ - block: - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless - name: Create symbolic link from .env file to repository file: diff --git a/roles/web-svc-simpleicons/tasks/main.yml b/roles/web-svc-simpleicons/tasks/main.yml index 2774db25..df8de367 100644 --- a/roles/web-svc-simpleicons/tasks/main.yml +++ b/roles/web-svc-simpleicons/tasks/main.yml @@ -2,7 +2,7 @@ - block: - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-docker-proxy + name: sys-stk-full-stateless - name: "Copy '{{ application_id }}' files" template: diff --git a/templates/roles/web-app/tasks/main.yml.j2 b/templates/roles/web-app/tasks/main.yml.j2 index d94c8374..5c9aa170 100644 --- a/templates/roles/web-app/tasks/main.yml.j2 +++ b/templates/roles/web-app/tasks/main.yml.j2 @@ -4,14 +4,14 @@ # Default: Loading; Docker, Database and Reverse Proxy - name: "load docker, db and proxy for '{{ application_id }}'" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful when: run_once_docker_{% endraw %}{{ application_id | replace("_", "-") }}{% raw %} is not defined {% endraw %} {% else %} {% raw %} - name: "load docker, proxy for '{{ application_id }}'" include_role: - name: cmp-db-docker-proxy + name: sys-stk-full-stateful when: run_once_docker_{% endraw %}{{ application_id | replace("_", "-") }}{% raw %} is not defined {% endraw %} {% endif %}