mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-07-27 02:31:10 +02:00
Solved application_id overwritting bug
This commit is contained in:
parent
9f61b4e50b
commit
996244b672
@ -1,6 +1,6 @@
|
|||||||
# run_once_cmp_docker_proxy: deactivated
|
# run_once_cmp_docker_proxy: deactivated
|
||||||
|
|
||||||
# To load the proxy firs is just implemented due to some issues with BBB
|
# To load the proxy first is just implemented due to some issues with BBB
|
||||||
- name: "For '{{ application_id }}': include role srv-proxy-6-6-domain"
|
- name: "For '{{ application_id }}': include role srv-proxy-6-6-domain"
|
||||||
include_role:
|
include_role:
|
||||||
name: srv-proxy-6-6-domain
|
name: srv-proxy-6-6-domain
|
||||||
|
@ -1,18 +1,10 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: "Store 'application_id' : {{ application_id }}"
|
|
||||||
set_fact:
|
|
||||||
original_application_id: "{{ application_id }}"
|
|
||||||
when: run_once_srv_web_core is not defined
|
|
||||||
|
|
||||||
- name: Include openresty
|
- name: Include openresty
|
||||||
include_role:
|
include_role:
|
||||||
name: svc-prx-openresty
|
name: svc-prx-openresty
|
||||||
when: run_once_srv_web_core is not defined
|
public: false
|
||||||
|
# Explicit set to guaranty that application_id will not be overwritten.
|
||||||
- name: "Restore 'application_id':\n Current: {{ application_id }}\n Restored: {{ original_application_id }}"
|
# Should be anyhow the default case
|
||||||
set_fact:
|
|
||||||
application_id: "{{ original_application_id }}"
|
|
||||||
when: run_once_srv_web_core is not defined
|
when: run_once_srv_web_core is not defined
|
||||||
|
|
||||||
- name: "reset (if enabled)"
|
- name: "reset (if enabled)"
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
---
|
---
|
||||||
|
# General
|
||||||
application_id: "web-app-matomo"
|
application_id: "web-app-matomo"
|
||||||
database_type: "mariadb"
|
database_type: "mariadb"
|
||||||
|
|
||||||
|
# Matomo
|
||||||
matomo_excluded_ips: "{{ applications | get_app_conf(application_id, 'excluded_ips', True) }}"
|
matomo_excluded_ips: "{{ applications | get_app_conf(application_id, 'excluded_ips', True) }}"
|
||||||
matomo_index_php_url: "{{ domains | get_url(application_id, web_protocol) }}/index.php"
|
matomo_index_php_url: "{{ domains | get_url(application_id, web_protocol) }}/index.php"
|
||||||
matomo_auth_token: "{{ applications | get_app_conf(application_id, 'credentials.auth_token', True) }}"
|
matomo_auth_token: "{{ applications | get_app_conf(application_id, 'credentials.auth_token', True) }}"
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
dest: "{{ item.target }}"
|
dest: "{{ item.target }}"
|
||||||
mode: '0755'
|
mode: '0755'
|
||||||
loop:
|
loop:
|
||||||
- { source: "server.js.j2", target: "{{ simpleicons_host_server_file }}" }
|
- { source: "server.js.j2", target: "{{ simpleicons_host_server_file }}" }
|
||||||
- { source: "package.json.j2", target: "{{ simpleicons_host_package_file }}" }
|
- { source: "package.json.j2", target: "{{ simpleicons_host_package_file }}" }
|
||||||
notify:
|
notify:
|
||||||
- docker compose up
|
- docker compose up
|
||||||
|
Loading…
x
Reference in New Issue
Block a user