mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-30 15:28:12 +02:00
THE HUGE REFACTORING CALENDER WEEK 33; Optimized Matrix and during this updated variables, and implemented better reset and cleanup mode handling, also solved some initial setup bugs
This commit is contained in:
@@ -6,13 +6,13 @@
|
||||
- include_tasks: utils/run_once.yml
|
||||
when: run_once_web_app_mybb is not defined
|
||||
|
||||
- name: "include tasks setup-domain.yml with {{domains | get_domain(application_id)}}"
|
||||
- name: "include tasks setup-domain.yml with {{ domains | get_domain(application_id) }}"
|
||||
include_tasks: setup-domain.yml
|
||||
loop: "{{ mybb_domains + [source_domain] }}"
|
||||
loop_control:
|
||||
loop_var: domain
|
||||
|
||||
- name: "load docker and db for {{application_id}}"
|
||||
- name: "load docker and db for {{ application_id }}"
|
||||
include_role:
|
||||
name: cmp-db-docker
|
||||
|
||||
|
@@ -2,12 +2,12 @@
|
||||
include_role:
|
||||
name: srv-web-6-6-tls-core
|
||||
vars:
|
||||
domain: "{{domains | get_domain(application_id)}}"
|
||||
domain: "{{ domains | get_domain(application_id) }}"
|
||||
|
||||
- name: configure {{domains | get_domain(application_id)}}.conf
|
||||
- name: configure {{ domains | get_domain(application_id) }}.conf
|
||||
template:
|
||||
src: "roles/srv-proxy-7-4-core/templates/vhost/basic.conf.j2"
|
||||
dest: "{{nginx.directories.http.servers}}{{domains | get_domain(application_id)}}.conf"
|
||||
dest: "{{ NGINX.DIRECTORIES.HTTP.SERVERS }}{{ domains | get_domain(application_id) }}.conf"
|
||||
notify: restart openresty
|
||||
vars:
|
||||
proxy_extra_configuration: "sub_filter '{{source_domain}}' '{{domains | get_domain(application_id)}}';"
|
||||
proxy_extra_configuration: "sub_filter '{{source_domain}}' '{{ domains | get_domain(application_id) }}';"
|
||||
|
@@ -6,7 +6,7 @@
|
||||
tag: "mybb_application"
|
||||
image: {{ mybb_image }}:{{ mybb_version }}
|
||||
container_name: {{ mybb_name }}
|
||||
restart: {{DOCKER_RESTART_POLICY}}
|
||||
restart: {{ DOCKER_RESTART_POLICY }}
|
||||
volumes:
|
||||
- data:/var/www/html
|
||||
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
|
||||
@@ -18,7 +18,7 @@
|
||||
options:
|
||||
tag: "mybb_server"
|
||||
image: nginx:mainline
|
||||
restart: {{DOCKER_RESTART_POLICY}}
|
||||
restart: {{ DOCKER_RESTART_POLICY }}
|
||||
ports:
|
||||
- "127.0.0.1:{{ports.localhost.http[application_id]}}:80"
|
||||
volumes:
|
||||
|
@@ -2,7 +2,7 @@
|
||||
application_id: "web-app-mybb"
|
||||
docker_compose_instance_confd_directory: "{{docker_compose.directories.instance}}conf.d/"
|
||||
docker_compose_instance_confd_defaultconf_file: "{{docker_compose_instance_confd_directory}}default.conf"
|
||||
target_mount_conf_d_directory: "{{nginx.directories.http.servers}}"
|
||||
target_mount_conf_d_directory: "{{ NGINX.DIRECTORIES.HTTP.SERVERS }}"
|
||||
source_domain: "mybb.{{ PRIMARY_DOMAIN }}"
|
||||
database_type: "mariadb"
|
||||
mybb_version: "{{ applications | get_app_conf(application_id, 'docker.services.mybb.version', True) }}"
|
||||
|
Reference in New Issue
Block a user