kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-08-18 09:45:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added no_logs, asyncs, and optimized listmonk variable names

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-08-16 02:00:13 +02:00
parent 7ffd79ebd9
commit 1bed83078e
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
roles/web-app-listmonk/tasks/main.yml
View File

@ -66,7 +66,10 @@
EOSQL EOSQL
args: args:
executable: /bin/bash executable: /bin/bash
loop: "{{ listmonk_settings }}" loop: "{{ LISTMONK_SETTINGS }}"
loop_control: loop_control:
label: "{{ item.key }}" label: "{{ item.key }}"
when: item.when is not defined or item.when 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 }}"

4
roles/web-app-listmonk/templates/docker-compose.yml.j2
View File

@ -2,8 +2,8 @@
application: application:
{% set container_healthcheck = 'health' %} {% set container_healthcheck = 'health' %}
{% include 'roles/docker-container/templates/base.yml.j2' %} {% include 'roles/docker-container/templates/base.yml.j2' %}
image: "{{ listmonk_image }}:{{ listmonk_version }}" image: "{{ LISTMONK_IMAGE }}:{{ LISTMONK_VERSION }}"
container_name: "{{ listmonk_name }}" container_name: "{{ LISTMONK_NAME }}"
ports: ports:
- "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}" - "127.0.0.1:{{ports.localhost.http[application_id]}}:{{ container_port }}"
volumes: volumes:

17
roles/web-app-listmonk/vars/main.yml
View File

@ -1,17 +1,18 @@
# General
application_id: "web-app-listmonk" application_id: "web-app-listmonk"
database_type: "postgres" 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
docker_compose_flush_handlers: false docker_compose_flush_handlers: false
# Listmonk Specific # Listmonk
listmonk_version: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version', True) }}" LISTMONK_VERSION: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.version') }}"
listmonk_image: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image', True) }}" LISTMONK_IMAGE: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.image') }}"
listmonk_name: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name', True) }}" LISTMONK_NAME: "{{ applications | get_app_conf(application_id, 'docker.services.listmonk.name') }}"
listmonk_settings: LISTMONK_SETTINGS:
- key: "app.root_url" - key: "app.root_url"
value: '"{{ domains | get_url(application_id, WEB_PROTOCOL) }}"' value: '"{{ domains | get_url(application_id, WEB_PROTOCOL) }}"'
@ -34,10 +35,10 @@ listmonk_settings:
value: 'true' value: 'true'
- key: "security.captcha_key" - 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" - 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 # SMTP servers
- key: "smtp" - key: "smtp"

7
roles/web-app-openproject/tasks/main.yml
View File

@ -32,9 +32,10 @@
RAILS_ENV={{ ENVIRONMENT | lower }} bundle exec rails runner \"Setting[:{{ item.key }}] = '{{ item.value }}'\"" RAILS_ENV={{ ENVIRONMENT | lower }} bundle exec rails runner \"Setting[:{{ item.key }}] = '{{ item.value }}'\""
args: args:
chdir: "{{ docker_compose.directories.instance }}" chdir: "{{ docker_compose.directories.instance }}"
loop: "{{ openproject_rails_settings | dict2items }}" loop: "{{ openproject_rails_settings | dict2items }}"
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}" async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL 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 - name: Setup LDAP
include_tasks: 01_ldap.yml include_tasks: 01_ldap.yml