Compare commits

..

No commits in common. "cc9b634bb882017c4018a90da72298ba3bd04859" and "b2df1ef6496a724cd441b49b08f9a01e71384b25" have entirely different histories.

3 changed files with 6 additions and 18 deletions

View File

@ -91,7 +91,6 @@ class FilterModule(object):
'frame-ancestors', 'frame-ancestors',
'frame-src', 'frame-src',
'script-src', 'script-src',
'script-src-elem',
'style-src', 'style-src',
'font-src', 'font-src',
'worker-src', 'worker-src',
@ -116,11 +115,11 @@ class FilterModule(object):
tokens.append(f"{web_protocol}://{matomo_domain}") tokens.append(f"{web_protocol}://{matomo_domain}")
# ReCaptcha integration: allow loading scripts from Google if feature enabled # ReCaptcha integration: allow loading scripts from Google if feature enabled
if self.is_feature_enabled(applications, 'recaptcha', application_id): if (
if directive == 'script-src': self.is_feature_enabled(applications, 'recaptcha', application_id)
tokens.append('https://www.google.com') and directive == 'script-src'
if directive == 'script-src-elem': ):
tokens.append('https://www.gstatic.com') tokens.append('https://www.google.com')
# Enable loading via ancestors # Enable loading via ancestors
if ( if (

View File

@ -3,11 +3,6 @@
- name: "include docker-compose role" - name: "include docker-compose role"
include_role: include_role:
name: docker-compose name: docker-compose
vars:
database_instance: "{{ application_id }}"
database_password: "{{ applications[application_id].credentials.postgresql_secret }}"
database_username: "postgres"
database_name: "" # Multiple databases
- name: "Seed BigBlueButton Database for Backup" - name: "Seed BigBlueButton Database for Backup"
include_tasks: "{{ playbook_dir }}/roles/backup-docker-to-local/tasks/seed-database-to-backup.yml" include_tasks: "{{ playbook_dir }}/roles/backup-docker-to-local/tasks/seed-database-to-backup.yml"

View File

@ -14,10 +14,4 @@ features:
central_database: false central_database: false
domains: domains:
canonical: canonical:
- "meet.{{ primary_domain }}" - "meet.{{ primary_domain }}"
csp:
flags:
script-src:
unsafe-inline: true
style-src:
unsafe-inline: true