changed default postgres logic and optimized discourse postgres integration

This commit is contained in:
Kevin Veen-Birkenbach 2024-01-05 11:27:04 +01:00
parent 9318333e77
commit 7ee06df3ba
11 changed files with 3 additions and 10 deletions

View File

@ -1,4 +1,3 @@
docker_compose_project_name: "baserow" docker_compose_project_name: "baserow"
database_password: "{{ baserow_database_password }}" database_password: "{{ baserow_database_password }}"
database_version: "{{ baserow_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -8,7 +8,9 @@
## visit http://www.yamllint.com/ to validate this file as needed ## visit http://www.yamllint.com/ to validate this file as needed
templates: templates:
{% if enable_central_database | bool %}
- "templates/postgres.template.yml" - "templates/postgres.template.yml"
{% endif %}
- "templates/redis.template.yml" - "templates/redis.template.yml"
- "templates/web.template.yml" - "templates/web.template.yml"
## Uncomment the next line to enable the IPv6 listener ## Uncomment the next line to enable the IPv6 listener

View File

@ -1,4 +1,3 @@
docker_compose_project_name: "discourse" docker_compose_project_name: "discourse"
database_password: "{{ baserow_database_password }}" database_password: "{{ baserow_database_password }}"
database_version: "{{ baserow_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -1,5 +1,4 @@
docker_compose_project_name: "funkwhale" docker_compose_project_name: "funkwhale"
nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;" nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 512M;"
database_password: "{{funkwhale_database_password}}" database_password: "{{funkwhale_database_password}}"
database_version: "{{ funkwhale_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -17,7 +17,6 @@ This Ansible role is designed for setting up and managing a GitLab server runnin
Variables are defined in `vars/main.yml`. Key variables include: Variables are defined in `vars/main.yml`. Key variables include:
- `docker_compose_instance_directory`: Directory for Docker Compose instances. - `docker_compose_instance_directory`: Directory for Docker Compose instances.
- `docker_compose_project_name`, `database_host`, `database_databasename`, `database_username`, `database_password`: Database configuration variables. - `docker_compose_project_name`, `database_host`, `database_databasename`, `database_username`, `database_password`: Database configuration variables.
- `database_version`: PostgreSQL version, with a default fallback.
## Handlers ## Handlers
- `recreate gitlab`: Restarts GitLab using Docker Compose when changes are detected. - `recreate gitlab`: Restarts GitLab using Docker Compose when changes are detected.

View File

@ -1,4 +1,3 @@
docker_compose_project_name: "gitlab" docker_compose_project_name: "gitlab"
database_password: "{{gitlab_database_password}}" database_password: "{{gitlab_database_password}}"
database_version: "{{ gitlab_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -1,4 +1,3 @@
docker_compose_project_name: "listmonk" docker_compose_project_name: "listmonk"
database_password: "{{listmonk_database_password}}" database_password: "{{listmonk_database_password}}"
database_version: "{{ listmonk_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -1,4 +1,3 @@
docker_compose_project_name: "mastodon" docker_compose_project_name: "mastodon"
database_password: "{{mastodon_database_password}}" database_password: "{{mastodon_database_password}}"
database_version: "{{ mastodon_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -1,5 +1,4 @@
--- ---
docker_compose_project_name: "matrix" docker_compose_project_name: "matrix"
database_password: "{{matrix_database_password}}" database_password: "{{matrix_database_password}}"
database_version: "{{ baserow_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -5,5 +5,4 @@ docker_compose_file_path: "{{docker_compose_instance_directory}}docker
docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose-backup.yml" docker_compose_backup_path: "/tmp/{{docker_compose_project_name}}-docker-compose-backup.yml"
database_password: "{{openproject_database_password}}" database_password: "{{openproject_database_password}}"
repository_address: "https://github.com/opf/openproject-deploy" repository_address: "https://github.com/opf/openproject-deploy"
database_version: "{{ openproject_database_version | default(postgres_default_version) }}"
database_type: "postgres" database_type: "postgres"

View File

@ -2,5 +2,5 @@ docker_compose_instance_directory: "{{ path_docker_compose_instances + docker_c
database_host: "{{ 'central-' + database_type if enable_central_database else 'database' }}" database_host: "{{ 'central-' + database_type if enable_central_database else 'database' }}"
database_databasename: "{{ docker_compose_project_name }}" database_databasename: "{{ docker_compose_project_name }}"
database_username: "{{ docker_compose_project_name }}" database_username: "{{ docker_compose_project_name }}"
database_version: "{{ postgres_default_version }}"
# This will lead to problems with bbb and openproject # This will lead to problems with bbb and openproject