mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2024-11-10 06:51:04 +01:00
Removed network suffix
This commit is contained in:
parent
cda6f1a8dc
commit
f8644515fa
@ -47,22 +47,22 @@
|
|||||||
dest: "{{discourse_repository_directory}}containers/app.yml"
|
dest: "{{discourse_repository_directory}}containers/app.yml"
|
||||||
notify: recreate discourse
|
notify: recreate discourse
|
||||||
|
|
||||||
- name: "Ensure {{docker_compose_project_name}}_default_network network exists"
|
- name: "Ensure {{docker_compose_project_name}}_default network exists"
|
||||||
community.docker.docker_network:
|
community.docker.docker_network:
|
||||||
name: "{{docker_compose_project_name}}_default_network"
|
name: "{{docker_compose_project_name}}_default"
|
||||||
state: present
|
state: present
|
||||||
when: enable_central_database | bool
|
when: enable_central_database | bool
|
||||||
|
|
||||||
- name: "add central database temporary to {{docker_compose_project_name}}_default_network"
|
- name: "add central database temporary to {{docker_compose_project_name}}_default"
|
||||||
command:
|
command:
|
||||||
cmd: "docker network connect discourse_default_network central-{{ database_type }}"
|
cmd: "docker network connect discourse_default central-{{ database_type }}"
|
||||||
when: enable_central_database | bool
|
when: enable_central_database | bool
|
||||||
|
|
||||||
- name: flush, to recreate discourse app
|
- name: flush, to recreate discourse app
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
when: enable_central_database | bool
|
when: enable_central_database | bool
|
||||||
|
|
||||||
- name: "remove central database from {{docker_compose_project_name}}_default_network"
|
- name: "remove central database from {{docker_compose_project_name}}_default"
|
||||||
command:
|
command:
|
||||||
cmd: "docker network disconnect discourse_default_network central-{{ database_type }}"
|
cmd: "docker network disconnect discourse_default central-{{ database_type }}"
|
||||||
when: enable_central_database | bool
|
when: enable_central_database | bool
|
||||||
|
@ -118,5 +118,5 @@ run:
|
|||||||
- exec: echo "End of custom commands"
|
- exec: echo "End of custom commands"
|
||||||
|
|
||||||
docker_args:
|
docker_args:
|
||||||
- --network={{docker_compose_project_name}}_default_network
|
- --network={{docker_compose_project_name}}_default
|
||||||
- --name=discourse_application
|
- --name=discourse_application
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
- name: Create Docker network for MariaDB
|
- name: Create Docker network for MariaDB
|
||||||
docker_network:
|
docker_network:
|
||||||
name: central_mariadb_network
|
name: central_mariadb
|
||||||
state: present
|
state: present
|
||||||
when: run_once_docker_mariadb is not defined
|
when: run_once_docker_mariadb is not defined
|
||||||
|
|
||||||
@ -18,7 +18,7 @@
|
|||||||
MARIADB_ROOT_PASSWORD: "{{central_mariadb_root_password}}"
|
MARIADB_ROOT_PASSWORD: "{{central_mariadb_root_password}}"
|
||||||
MARIADB_AUTO_UPGRADE: "1"
|
MARIADB_AUTO_UPGRADE: "1"
|
||||||
networks:
|
networks:
|
||||||
- name: central_mariadb_network
|
- name: central_mariadb
|
||||||
volumes:
|
volumes:
|
||||||
- central_mariadb_database:/var/lib/mysql
|
- central_mariadb_database:/var/lib/mysql
|
||||||
published_ports:
|
published_ports:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
- name: Create Docker network for PostgreSQL
|
- name: Create Docker network for PostgreSQL
|
||||||
docker_network:
|
docker_network:
|
||||||
name: central_postgres_network
|
name: central_postgres
|
||||||
state: present
|
state: present
|
||||||
when: run_once_docker_postgres is not defined
|
when: run_once_docker_postgres is not defined
|
||||||
|
|
||||||
@ -13,7 +13,7 @@
|
|||||||
POSTGRES_PASSWORD: "{{ central_postgres_password }}"
|
POSTGRES_PASSWORD: "{{ central_postgres_password }}"
|
||||||
POSTGRES_INITDB_ARGS: "--encoding=UTF8 --locale=C" # Necessary for docker-matrix
|
POSTGRES_INITDB_ARGS: "--encoding=UTF8 --locale=C" # Necessary for docker-matrix
|
||||||
networks:
|
networks:
|
||||||
- name: central_postgres_network
|
- name: central_postgres
|
||||||
published_ports:
|
published_ports:
|
||||||
- "127.0.0.1:5432:5432"
|
- "127.0.0.1:5432:5432"
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
# This template needs to be included in docker-compose.yml
|
# This template needs to be included in docker-compose.yml
|
||||||
networks:
|
networks:
|
||||||
{% if enable_central_database | bool %}
|
{% if enable_central_database | bool %}
|
||||||
central_{{ database_type }}_network:
|
central_{{ database_type }}:
|
||||||
external: true
|
external: true
|
||||||
{% endif %}
|
{% endif %}
|
||||||
default_network:
|
default:
|
||||||
{{ "\n" }}
|
{{ "\n" }}
|
@ -1,7 +1,7 @@
|
|||||||
# This template needs to be included in docker-compose.yml containers
|
# This template needs to be included in docker-compose.yml containers
|
||||||
networks:
|
networks:
|
||||||
default_network:
|
default:
|
||||||
{% if enable_central_database | bool %}
|
{% if enable_central_database | bool %}
|
||||||
central_{{ database_type }}_network:
|
central_{{ database_type }}:
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ "\n" }}
|
{{ "\n" }}
|
@ -21,6 +21,6 @@
|
|||||||
timeout: 1s
|
timeout: 1s
|
||||||
retries: 5
|
retries: 5
|
||||||
networks:
|
networks:
|
||||||
- default_network
|
- default
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ "\n" }}
|
{{ "\n" }}
|
@ -19,6 +19,6 @@
|
|||||||
source: database
|
source: database
|
||||||
target: /var/lib/postgresql/data
|
target: /var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
- default_network
|
- default
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{{ "\n" }}
|
{{ "\n" }}
|
@ -13,5 +13,5 @@
|
|||||||
timeout: 3s
|
timeout: 3s
|
||||||
retries: 30
|
retries: 30
|
||||||
networks:
|
networks:
|
||||||
- default_network
|
- default
|
||||||
{{ "\n" }}
|
{{ "\n" }}
|
Loading…
Reference in New Issue
Block a user