mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-08-17 17:26:42 +02:00
Added no_logs, asyncs, and optimized listmonk variable names
This commit is contained in:
parent
7ffd79ebd9
commit
1bed83078e
@ -66,7 +66,10 @@
|
||||
EOSQL
|
||||
args:
|
||||
executable: /bin/bash
|
||||
loop: "{{ listmonk_settings }}"
|
||||
loop: "{{ LISTMONK_SETTINGS }}"
|
||||
loop_control:
|
||||
label: "{{ item.key }}"
|
||||
when: item.when is not defined or item.when
|
||||
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||
|
@ -2,8 +2,8 @@
|
||||
application:
|
||||
{% set container_healthcheck = 'health' %}
|
||||
{% include 'roles/docker-container/templates/base.yml.j2' %}
|
||||
image: "{{ listmonk_image }}:{{ listmonk_version }}"
|
||||
container_name: "{{ listmonk_name }}"
|
||||
image: "{{ LISTMONK_IMAGE }}:{{ LISTMONK_VERSION }}"
|
||||
container_name: "{{ LISTMONK_NAME }}"
|
||||
ports:
|
||||
- "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
|
||||
volumes:
|
||||
|
@ -1,17 +1,18 @@
|
||||
# General
|
||||
application_id: "web-app-listmonk"
|
||||
database_type: "postgres"
|
||||
|
||||
container_port: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port', True) }}"
|
||||
container_port: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.port') }}"
|
||||
|
||||
# Docker
|
||||
docker_compose_flush_handlers: false
|
||||
|
||||
# Listmonk Specific
|
||||
listmonk_version: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version', True) }}"
|
||||
listmonk_image: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image', True) }}"
|
||||
listmonk_name: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name', True) }}"
|
||||
# Listmonk
|
||||
LISTMONK_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
|
||||
LISTMONK_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
|
||||
LISTMONK_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
|
||||
|
||||
listmonk_settings:
|
||||
LISTMONK_SETTINGS:
|
||||
- key: "app.root_url"
|
||||
value: '"{{ domains | get_url(application_id, WEB_PROTOCOL) }}"'
|
||||
|
||||
@ -34,10 +35,10 @@ listmonk_settings:
|
||||
value: 'true'
|
||||
|
||||
- key: "security.captcha_key"
|
||||
value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_site_key", True) }}"'
|
||||
value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_site_key") }}"'
|
||||
|
||||
- key: "security.captcha_secret"
|
||||
value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_secret", True) }}"'
|
||||
value: '"{{ applications | get_app_conf(application_id, "credentials.hcaptcha_secret") }}"'
|
||||
|
||||
# SMTP servers
|
||||
- key: "smtp"
|
||||
|
@ -32,9 +32,10 @@
|
||||
RAILS_ENV={{ ENVIRONMENT | lower }} bundle exec rails runner \"Setting[:{{ item.key }}] = '{{ item.value }}'\""
|
||||
args:
|
||||
chdir: "{{ docker_compose.directories.instance }}"
|
||||
loop: "{{ openproject_rails_settings | dict2items }}"
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||
loop: "{{ openproject_rails_settings | dict2items }}"
|
||||
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
|
||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
|
||||
|
||||
- name: Setup LDAP
|
||||
include_tasks: 01_ldap.yml
|
||||
|
Loading…
x
Reference in New Issue
Block a user