diff --git a/roles/backup-docker-to-local/tasks/seed-database-to-backup.yml b/roles/backup-docker-to-local/tasks/seed-database-to-backup.yml index be060e60..c3cb771e 100644 --- a/roles/backup-docker-to-local/tasks/seed-database-to-backup.yml +++ b/roles/backup-docker-to-local/tasks/seed-database-to-backup.yml @@ -1,4 +1,4 @@ -# This file is also used by docker-matrix-compose +# This file is also used by docker-matrix - name: "Display all database variables" debug: diff --git a/roles/docker-elk/vars/main.yml b/roles/docker-elk/vars/main.yml new file mode 100644 index 00000000..8fd85cc8 --- /dev/null +++ b/roles/docker-elk/vars/main.yml @@ -0,0 +1 @@ +application_id: elk \ No newline at end of file diff --git a/roles/docker-jenkins/vars/main.yml b/roles/docker-jenkins/vars/main.yml new file mode 100644 index 00000000..c9475dd8 --- /dev/null +++ b/roles/docker-jenkins/vars/main.yml @@ -0,0 +1 @@ +application_id: jenkins \ No newline at end of file diff --git a/roles/docker-matrix-ansible/vars/main.yml b/roles/docker-matrix-ansible/vars/main.yml deleted file mode 100644 index 798e8e45..00000000 --- a/roles/docker-matrix-ansible/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -local_repository_directory: "{{role_path}}/matrix-docker-ansible-deploy" \ No newline at end of file diff --git a/roles/docker-matrix-ansible/.gitignore b/roles/docker-matrix-deprecated/.gitignore similarity index 100% rename from roles/docker-matrix-ansible/.gitignore rename to roles/docker-matrix-deprecated/.gitignore diff --git a/roles/docker-matrix-ansible/Administration.md b/roles/docker-matrix-deprecated/Administration.md similarity index 100% rename from roles/docker-matrix-ansible/Administration.md rename to roles/docker-matrix-deprecated/Administration.md diff --git a/roles/docker-matrix-ansible/README.md b/roles/docker-matrix-deprecated/README.md similarity index 98% rename from roles/docker-matrix-ansible/README.md rename to roles/docker-matrix-deprecated/README.md index a5a8a8cf..c400fda1 100644 --- a/roles/docker-matrix-ansible/README.md +++ b/roles/docker-matrix-deprecated/README.md @@ -1,4 +1,4 @@ -# Matrix (Ansible - Deprecated) +# Matrix (Deprecated) ## Warning This role is experimental and may not be actively maintained. Use it with caution in production environments. For a more stable deployment, please consider using the Matrix Compose role or another alternative solution. diff --git a/roles/docker-matrix-ansible/meta/main.yml b/roles/docker-matrix-deprecated/meta/main.yml similarity index 100% rename from roles/docker-matrix-ansible/meta/main.yml rename to roles/docker-matrix-deprecated/meta/main.yml diff --git a/roles/docker-matrix-ansible/tasks/main.yml b/roles/docker-matrix-deprecated/tasks/main.yml similarity index 100% rename from roles/docker-matrix-ansible/tasks/main.yml rename to roles/docker-matrix-deprecated/tasks/main.yml diff --git a/roles/docker-matrix-ansible/templates/hosts.yml.j2 b/roles/docker-matrix-deprecated/templates/hosts.yml.j2 similarity index 100% rename from roles/docker-matrix-ansible/templates/hosts.yml.j2 rename to roles/docker-matrix-deprecated/templates/hosts.yml.j2 diff --git a/roles/docker-matrix-ansible/templates/vars.yml.j2 b/roles/docker-matrix-deprecated/templates/vars.yml.j2 similarity index 100% rename from roles/docker-matrix-ansible/templates/vars.yml.j2 rename to roles/docker-matrix-deprecated/templates/vars.yml.j2 diff --git a/roles/docker-matrix-deprecated/vars/main.yml b/roles/docker-matrix-deprecated/vars/main.yml new file mode 100644 index 00000000..1c86583c --- /dev/null +++ b/roles/docker-matrix-deprecated/vars/main.yml @@ -0,0 +1,3 @@ +--- +local_repository_directory: "{{role_path}}/matrix-docker-ansible-deploy" +application_id: "matrix-deprecated" # Just added to catch integration test exceptions. This role is anyhow deprecated. \ No newline at end of file diff --git a/roles/docker-matrix-compose/Administration.md b/roles/docker-matrix/Administration.md similarity index 100% rename from roles/docker-matrix-compose/Administration.md rename to roles/docker-matrix/Administration.md diff --git a/roles/docker-matrix-compose/Installation.md b/roles/docker-matrix/Installation.md similarity index 100% rename from roles/docker-matrix-compose/Installation.md rename to roles/docker-matrix/Installation.md diff --git a/roles/docker-matrix-compose/README.md b/roles/docker-matrix/README.md similarity index 100% rename from roles/docker-matrix-compose/README.md rename to roles/docker-matrix/README.md diff --git a/roles/docker-matrix-compose/meta/main.yml b/roles/docker-matrix/meta/main.yml similarity index 100% rename from roles/docker-matrix-compose/meta/main.yml rename to roles/docker-matrix/meta/main.yml diff --git a/roles/docker-matrix-compose/meta/schema.yml b/roles/docker-matrix/meta/schema.yml similarity index 100% rename from roles/docker-matrix-compose/meta/schema.yml rename to roles/docker-matrix/meta/schema.yml diff --git a/roles/docker-matrix-compose/tasks/create-and-seed-database.yml b/roles/docker-matrix/tasks/create-and-seed-database.yml similarity index 100% rename from roles/docker-matrix-compose/tasks/create-and-seed-database.yml rename to roles/docker-matrix/tasks/create-and-seed-database.yml diff --git a/roles/docker-matrix-compose/tasks/main.yml b/roles/docker-matrix/tasks/main.yml similarity index 100% rename from roles/docker-matrix-compose/tasks/main.yml rename to roles/docker-matrix/tasks/main.yml diff --git a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 b/roles/docker-matrix/templates/docker-compose.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/docker-compose.yml.j2 rename to roles/docker-matrix/templates/docker-compose.yml.j2 diff --git a/roles/docker-matrix-compose/templates/element.config.json.j2 b/roles/docker-matrix/templates/element.config.json.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/element.config.json.j2 rename to roles/docker-matrix/templates/element.config.json.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/facebook.config.yml.j2 b/roles/docker-matrix/templates/mautrix/facebook.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/facebook.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/facebook.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/imessage.config.yml.j2 b/roles/docker-matrix/templates/mautrix/imessage.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/imessage.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/imessage.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/instagram.config.yml.j2 b/roles/docker-matrix/templates/mautrix/instagram.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/instagram.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/instagram.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/signal.config.yml.j2 b/roles/docker-matrix/templates/mautrix/signal.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/signal.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/signal.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/slack.config.yml.j2 b/roles/docker-matrix/templates/mautrix/slack.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/slack.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/slack.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/telegram.config.yml.j2 b/roles/docker-matrix/templates/mautrix/telegram.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/telegram.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/telegram.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/mautrix/whatsapp.config.yml.j2 b/roles/docker-matrix/templates/mautrix/whatsapp.config.yml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/mautrix/whatsapp.config.yml.j2 rename to roles/docker-matrix/templates/mautrix/whatsapp.config.yml.j2 diff --git a/roles/docker-matrix-compose/templates/nginx.conf.j2 b/roles/docker-matrix/templates/nginx.conf.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/nginx.conf.j2 rename to roles/docker-matrix/templates/nginx.conf.j2 diff --git a/roles/docker-matrix-compose/templates/synapse/homeserver.yaml.j2 b/roles/docker-matrix/templates/synapse/homeserver.yaml.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/synapse/homeserver.yaml.j2 rename to roles/docker-matrix/templates/synapse/homeserver.yaml.j2 diff --git a/roles/docker-matrix-compose/templates/synapse/log.config.j2 b/roles/docker-matrix/templates/synapse/log.config.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/synapse/log.config.j2 rename to roles/docker-matrix/templates/synapse/log.config.j2 diff --git a/roles/docker-matrix-compose/templates/well-known.j2 b/roles/docker-matrix/templates/well-known.j2 similarity index 100% rename from roles/docker-matrix-compose/templates/well-known.j2 rename to roles/docker-matrix/templates/well-known.j2 diff --git a/roles/docker-matrix-compose/vars/configuration.yml b/roles/docker-matrix/vars/configuration.yml similarity index 100% rename from roles/docker-matrix-compose/vars/configuration.yml rename to roles/docker-matrix/vars/configuration.yml diff --git a/roles/docker-matrix-compose/vars/main.yml b/roles/docker-matrix/vars/main.yml similarity index 100% rename from roles/docker-matrix-compose/vars/main.yml rename to roles/docker-matrix/vars/main.yml diff --git a/roles/docker-xmpp/vars/main.yml b/roles/docker-xmpp/vars/main.yml new file mode 100644 index 00000000..d015404b --- /dev/null +++ b/roles/docker-xmpp/vars/main.yml @@ -0,0 +1 @@ +application_id: xmpp \ No newline at end of file diff --git a/tasks/server.yml b/tasks/server.yml index 167c7406..8e854f57 100644 --- a/tasks/server.yml +++ b/tasks/server.yml @@ -148,7 +148,7 @@ - name: setup matrix with flavor 'compose' include_role: - name: docker-matrix-compose + name: docker-matrix when: applications.matrix.role == 'compose' and ("matrix" in group_names) - name: setup open project instances diff --git a/tests/integration/test_application_id_consistency.py b/tests/integration/test_application_id_consistency.py index 21e2937d..75d822c3 100644 --- a/tests/integration/test_application_id_consistency.py +++ b/tests/integration/test_application_id_consistency.py @@ -11,6 +11,9 @@ class TestApplicationIdConsistency(unittest.TestCase): failed_roles = [] for role_path in ROLES_DIR.iterdir(): + if role_path.name in ["docker-compose", "docker-central-database", "docker-repository-setup"]: + continue + if role_path.is_dir() and role_path.name.startswith("docker-"): expected_id = role_path.name.replace("docker-", "", 1) vars_file = role_path / "vars" / "main.yml"