finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify mx-puppet-skype blacklists a bit

Browse Source 
Related to #466 (Github Pull Request).
This commit is contained in:
Slavi Pantaleev 2020-04-22 22:42:16 +03:00
parent 7ab4b4b151
commit 0af5a8c4cc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/matrix-bridge-mx-puppet-skype/defaults/main.yml
View File

@ -27,14 +27,14 @@ matrix_mx_puppet_skype_provisioning_whitelist:
# Leave empty to disable blacklist # Leave empty to disable blacklist
# "@user:server.com" disallow a specific user # "@user:server.com" disallow a specific user
# "@.*:yourserver.com" disallow users on a specific homeserver # "@.*:yourserver.com" disallow users on a specific homeserver
matrix_mx_puppet_skype_provisioning_blacklist: matrix_mx_puppet_skype_provisioning_blacklist: []
# Same as provisioning # Same as provisioning
matrix_mx_puppet_skype_relay_whitelist: matrix_mx_puppet_skype_relay_whitelist:
- "@.*:{{ matrix_domain|regex_escape }}" - "@.*:{{ matrix_domain|regex_escape }}"
# Same as provisioning # Same as provisioning
matrix_mx_puppet_skype_relay_blacklist: matrix_mx_puppet_skype_relay_blacklist: []
# A list of extra arguments to pass to the container # A list of extra arguments to pass to the container
matrix_mx_puppet_skype_container_extra_arguments: [] matrix_mx_puppet_skype_container_extra_arguments: []
@ -154,9 +154,7 @@ matrix_mx_puppet_skype_configuration_yaml: |
#- "@user:server\\.com" #- "@user:server\\.com"
# Disallow users on a specific homeserver # Disallow users on a specific homeserver
#- "@.*:yourserver\\.com" #- "@.*:yourserver\\.com"
{% if matrix_mx_puppet_skype_provisioning_blacklist %}
blacklist: {{ matrix_mx_puppet_skype_provisioning_blacklist|to_json }} blacklist: {{ matrix_mx_puppet_skype_provisioning_blacklist|to_json }}
{% endif %}
presence: presence:
# Bridge online/offline status # Bridge online/offline status
@ -178,9 +176,7 @@ matrix_mx_puppet_skype_configuration_yaml: |
#blacklist: #blacklist:
#- "@user:yourserver\\.com" #- "@user:yourserver\\.com"
{% if matrix_mx_puppet_skype_relay_blacklist %}
blacklist: {{ matrix_mx_puppet_skype_relay_blacklist|to_json }} blacklist: {{ matrix_mx_puppet_skype_relay_blacklist|to_json }}
{% endif %}
# Map certain homeserver URLs to the C-S API endpoint # Map certain homeserver URLs to the C-S API endpoint
# Useful for double-puppeting if .well-known is unavailable for some reason # Useful for double-puppeting if .well-known is unavailable for some reason