Different small optimatiosn

This commit is contained in:
Kevin Veen-Birkenbach 2025-04-23 13:25:52 +02:00
parent 1376930e5c
commit fd0a978a16
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
6 changed files with 16 additions and 12 deletions

View File

@ -50,15 +50,19 @@ env:
## on initial signup example 'user1@example.com,user2@example.com' ## on initial signup example 'user1@example.com,user2@example.com'
DISCOURSE_DEVELOPER_EMAILS: {{users.administrator.email}} DISCOURSE_DEVELOPER_EMAILS: {{users.administrator.email}}
# Set Logo
DISCOURSE_LOGO_URL: "{{service_provider.platform.logo}}"
DISCOURSE_LOGO_SMALL_URL: "{{service_provider.platform.logo}}"
# SMTP ADDRESS, username, and password are required # SMTP ADDRESS, username, and password are required
# WARNING the char '#' in SMTP password can cause problems! # WARNING the char '#' in SMTP password can cause problems!
DISCOURSE_SMTP_ADDRESS: {{ system_email.host }} DISCOURSE_SMTP_ADDRESS: {{ system_email.host }}
DISCOURSE_SMTP_PORT: {{ system_email.port }} DISCOURSE_SMTP_PORT: {{ system_email.port }}
DISCOURSE_SMTP_USER_NAME: {{system_email.username}} DISCOURSE_SMTP_USER_NAME: {{ system_email.username }}
DISCOURSE_SMTP_PASSWORD: {{ system_email.password }} DISCOURSE_SMTP_PASSWORD: {{ system_email.password }}
DISCOURSE_SMTP_ENABLE_START_TLS: {{ system_email.start_tls | upper }} DISCOURSE_SMTP_ENABLE_START_TLS: {{ system_email.start_tls | upper }}
DISCOURSE_SMTP_DOMAIN: {{ system_email.domain }} DISCOURSE_SMTP_DOMAIN: {{ system_email.domain }}
DISCOURSE_NOTIFICATION_EMAIL: {{system_email.from}} DISCOURSE_NOTIFICATION_EMAIL: {{ system_email.from }}
# Database Configuration # Database Configuration
DISCOURSE_DB_USERNAME: {{ database_username }} DISCOURSE_DB_USERNAME: {{ database_username }}

View File

@ -0,0 +1 @@
FLASK_DEBUG={{ enable_debug }}

View File

@ -3,13 +3,19 @@
include_role: include_role:
name: docker-discourse name: docker-discourse
- name: Wait for Discourse API
wait_for:
host: "{{ domains.discourse }}"
port: 80
delay: 5
timeout: 600
- name: "Generate Discourse API Key when WP Discourse is enabled" - name: "Generate Discourse API Key when WP Discourse is enabled"
include_tasks: generate-api-key.yml include_tasks: generate-api-key.yml
- name: "Load WP Discourse settings" - name: "Load WP Discourse settings"
include_vars: include_vars:
file: "{{ role_path }}/vars/discourse.yml" file: "{{ role_path }}/vars/discourse.yml"
# <— drop the `name:` here so `discourse_settings` is the list itself
- name: "Install WP Discourse plugin" - name: "Install WP Discourse plugin"
command: > command: >

View File

@ -7,13 +7,6 @@
args: args:
chdir: "{{ docker_compose.directories.instance }}" chdir: "{{ docker_compose.directories.instance }}"
- name: Wait for Discourse API
wait_for:
host: "{{ domains.discourse }}"
port: 80
delay: 5
timeout: 600
- name: "Activate OpenID Connect Generic Plugin" - name: "Activate OpenID Connect Generic Plugin"
command: > command: >
docker-compose exec -u www-data -T application docker-compose exec -u www-data -T application

View File

@ -242,4 +242,4 @@ discourse_settings:
# #
- name: discourse_logs - name: discourse_logs
key: logs-enabled key: logs-enabled
value: {{ enable_debug }} value: "{{ enable_debug }}"

View File

@ -121,7 +121,7 @@ defaults_applications:
{% endraw %}{{ features.render_features({ {% endraw %}{{ features.render_features({
'matomo': true, 'matomo': true,
'css': true, 'css': true,
'iframe': true, 'iframe': false,
'oidc': true, 'oidc': true,
'database': true, 'database': true,
}) }}{% raw %} }) }}{% raw %}