Compare commits

...

3 Commits

5 changed files with 14 additions and 18 deletions

View File

@@ -13,3 +13,5 @@
loop: "{{ cloudflare_domains }}" loop: "{{ cloudflare_domains }}"
loop_control: loop_control:
label: "{{ item }}" label: "{{ item }}"
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"

View File

@@ -16,7 +16,7 @@ server:
unsafe-inline: true unsafe-inline: true
whitelist: whitelist:
font-src: font-src:
- "http://*.{{PRIMARY_DOMAIN}}" - "{{ WEB_PROTOCOL }}://*.{{PRIMARY_DOMAIN}}"
domains: domains:
canonical: canonical:
- "forum.{{ PRIMARY_DOMAIN }}" - "forum.{{ PRIMARY_DOMAIN }}"

View File

@@ -21,4 +21,6 @@
args: args:
executable: /bin/bash executable: /bin/bash
chdir: "{{docker_repository_directory }}" chdir: "{{docker_repository_directory }}"
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
listen: recreate discourse listen: recreate discourse

View File

@@ -39,6 +39,8 @@
tls_certificate_string = '{{ openproject_ldap.tls_certificate_string }}' tls_certificate_string = '{{ openproject_ldap.tls_certificate_string }}'
WHERE name = '{{ openproject_ldap.name }}'; WHERE name = '{{ openproject_ldap.name }}';
when: ldap_check.query_result | length > 0 when: ldap_check.query_result | length > 0
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
- name: Create new LDAP auth source - name: Create new LDAP auth source
community.postgresql.postgresql_query: community.postgresql.postgresql_query:
@@ -73,22 +75,8 @@
'{{ openproject_ldap.tls_certificate_string }}' '{{ openproject_ldap.tls_certificate_string }}'
); );
when: ldap_check.query_result | length == 0 when: ldap_check.query_result | length == 0
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
- name: Show all LDAP sources (debug) poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
community.postgresql.postgresql_query:
db: "{{ database_name }}"
login_user: "{{ database_username }}"
login_password: "{{ database_password }}"
login_host: "127.0.0.1"
login_port: "{{ database_port }}"
query: "SELECT id, name FROM ldap_auth_sources"
register: ldap_entries
when: MODE_DEBUG | bool
- name: Debug LDAP entries
debug:
var: ldap_entries
when: MODE_DEBUG | bool
# This works just after the first admin login # This works just after the first admin login
# @todo Remove and replace trough LDAP RBAC group # @todo Remove and replace trough LDAP RBAC group
@@ -108,4 +96,6 @@
\" \"
" "
args: args:
chdir: "{{ docker_compose.directories.instance }}" chdir: "{{ docker_compose.directories.instance }}"
async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"

View File

@@ -33,6 +33,8 @@
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 }}"
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
- name: Setup LDAP - name: Setup LDAP
include_tasks: 01_ldap.yml include_tasks: 01_ldap.yml