Commit bb4f1ce5 authored by ale's avatar ale
Browse files

Fix SSO configuration for test environments

parent f4c18e22
Pipeline #15292 failed with stage
in 19 seconds
......@@ -9,7 +9,7 @@ stages:
variables:
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
BUILD_DIR: "/tmp/build-$CI_JOB_ID"
BUILD_DIR: "build-$CI_JOB_ID"
docker_build_and_release_tests:
stage: docker_build
......
......@@ -128,7 +128,9 @@
loop: "{{ sieve_filters | zip(dovecot_sieve_scripts.results) | list }}"
rescue:
- name: Reload Dovecot
command: "systemctl reload dovecot"
systemd:
name: dovecot
state: restarted
- name: Compile the default sieve filters
shell: "env HOME=/tmp sievec /var/lib/dovecot/sieve/{{ item.0 }}"
when: "item.1.changed"
......
......@@ -21,18 +21,18 @@ sso_server_url_path_prefix: "/sso/"
sso_server_account_recovery_url: "/account/recovery"
sso_extra_allowed_services:
- "[^.]+\\.webmail\\.autistici\\.org/$"
- "^services\\.autistici\\.org/admin/$"
- "^(imap|accountserver|mailman)\\.investici\\.org/$"
- "[^.]+\\.webmail\\.({{ domain_public | map('regex_escape') | join('|') }})$"
- "^services\\.({{ domain_public | map('regex_escape') | join('|') }})/admin/$"
- "^(imap|accountserver|mailman)\\.{{ domain | regex_escape }}/$"
sso_allowed_exchanges:
- src_regexp: "^[^.]+\\.webmail\\.({{ domain_public | join('|') }})/$"
- src_regexp: "^[^.]+\\.webmail\\.({{ domain_public | map('regex_escape') | join('|') }})/$"
dst_regexp: "^imap\\.{{ domain | regex_escape }}/$"
- src_regexp: "^accounts\\.({{ domain_public | join('|') }})/$"
- src_regexp: "^accounts\\.({{ domain_public | map('regex_escape') | join('|') }})/$"
dst_regexp: "^(accountserver|mailman)\\.{{ domain | regex_escape }}/$"
- src_regexp: "^accountadmin\\.({{ domain_public | join('|') }})/$"
- src_regexp: "^accountadmin\\.({{ domain_public | map('regex_escape') | join('|') }})/$"
dst_regexp: "^(accountserver|mailman)\\.{{ domain | regex_escape }}/$"
- src_regexp: "^services\\.({{ domain_public | join('|') }})/admin/$"
- src_regexp: "^services\\.({{ domain_public | map('regex_escape') | join('|') }})/admin/$"
dst_regexp: "^accountserver\\.{{ domain | regex_escape }}/$"
# Run the service-prober on the testdata accounts.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment