Browse Source

add missing _config_ to some variable names

pull/4401/head
Virkkunen 8 months ago
parent
commit
c04dfe2384
2 changed files with 15 additions and 17 deletions
  1. +8
    -10
      roles/custom/matrix-continuwuity/defaults/main.yml
  2. +7
    -7
      roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2

+ 8
- 10
roles/custom/matrix-continuwuity/defaults/main.yml View File

@@ -169,11 +169,8 @@ matrix_continuwuity_config_allow_check_for_updates: false
# Controls the `emergency_password` setting. # Controls the `emergency_password` setting.
matrix_continuwuity_config_emergency_password: '' matrix_continuwuity_config_emergency_password: ''


# Controls the `allow_federation` setting.
matrix_continuwuity_config_allow_federation: true

# Controls the `matrix_continuwuity_trusted_servers`` setting. # Controls the `matrix_continuwuity_trusted_servers`` setting.
matrix_continuwuity_trusted_servers:
matrix_continuwuity_config_trusted_servers:
- "matrix.org" - "matrix.org"


# Controls the `matrix_continuwuity_config_log` setting. # Controls the `matrix_continuwuity_config_log` setting.
@@ -190,14 +187,15 @@ matrix_continuwuity_config_turn_password: ''
matrix_continuwuity_self_check_validate_certificates: true matrix_continuwuity_self_check_validate_certificates: true


# Controls server (de)federation settings. # Controls server (de)federation settings.
matrix_continuwuity_allowed_remote_server_names: []
matrix_continuwuity_forbidden_remote_server_names: []
matrix_continuwuity_forbidden_remote_room_directory_server_names: []
matrix_continuwuity_prevent_media_downloads_from: []
matrix_continuwuity_ignore_messages_from_server_names: []
matrix_continuwuity_config_allow_federation: true
matrix_continuwuity_config_allowed_remote_server_names: []
matrix_continuwuity_config_forbidden_remote_server_names: []
matrix_continuwuity_config_forbidden_remote_room_directory_server_names: []
matrix_continuwuity_config_prevent_media_downloads_from: []
matrix_continuwuity_config_ignore_messages_from_server_names: []


# Controls the `url_preview_domain_contains_allowlist` setting. # Controls the `url_preview_domain_contains_allowlist` setting.
matrix_continuwuity_url_preview_domain_contains_allowlist: []
matrix_continuwuity_config_url_preview_domain_contains_allowlist: []


# Additional environment variables to pass to the container. # Additional environment variables to pass to the container.
# #


+ 7
- 7
roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2 View File

@@ -599,7 +599,7 @@ allow_federation = {{ matrix_continuwuity_config_allow_federation | to_json }}
# #
# example: ["matrix.org", "tchncs.de"] # example: ["matrix.org", "tchncs.de"]
# #
trusted_servers = {{ matrix_continuwuity_trusted_servers | to_json }}
trusted_servers = {{ matrix_continuwuity_config_trusted_servers | to_json }}


# Whether to query the servers listed in trusted_servers first or query # Whether to query the servers listed in trusted_servers first or query
# the origin server first. For best security, querying the origin server # the origin server first. For best security, querying the origin server
@@ -1215,7 +1215,7 @@ emergency_password = {{ matrix_continuwuity_config_emergency_password | to_json
# #
# example: ["badserver\\.tld$", "badphrase", "19dollarfortnitecards"] # example: ["badserver\\.tld$", "badphrase", "19dollarfortnitecards"]
# #
forbidden_remote_server_names = {{ matrix_continuwuity_forbidden_remote_server_names | to_json }}
forbidden_remote_server_names = {{ matrix_continuwuity_config_forbidden_remote_server_names | to_json }}


# List of allowed server names via regex patterns that we will allow, # List of allowed server names via regex patterns that we will allow,
# regardless of if they match `forbidden_remote_server_names`. # regardless of if they match `forbidden_remote_server_names`.
@@ -1224,14 +1224,14 @@ forbidden_remote_server_names = {{ matrix_continuwuity_forbidden_remote_server_n
# #
# example: ["goodserver\\.tld$", "goodphrase"] # example: ["goodserver\\.tld$", "goodphrase"]
# #
allowed_remote_server_names = {{ matrix_continuwuity_allowed_remote_server_names | to_json }}
allowed_remote_server_names = {{ matrix_continuwuity_config_allowed_remote_server_names | to_json }}


# Vector list of regex patterns of server names that continuwuity will # Vector list of regex patterns of server names that continuwuity will
# refuse to download remote media from. # refuse to download remote media from.
# #
# example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"] # example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"]
# #
prevent_media_downloads_from = {{ matrix_continuwuity_prevent_media_downloads_from | to_json }}
prevent_media_downloads_from = {{ matrix_continuwuity_config_prevent_media_downloads_from | to_json }}


# List of forbidden server names via regex patterns that we will block all # List of forbidden server names via regex patterns that we will block all
# outgoing federated room directory requests for. Useful for preventing # outgoing federated room directory requests for. Useful for preventing
@@ -1239,7 +1239,7 @@ prevent_media_downloads_from = {{ matrix_continuwuity_prevent_media_downloads_fr
# #
# example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"] # example: ["badserver\.tld$", "badphrase", "19dollarfortnitecards"]
# #
forbidden_remote_room_directory_server_names = {{ matrix_continuwuity_forbidden_remote_room_directory_server_names | to_json }}
forbidden_remote_room_directory_server_names = {{ matrix_continuwuity_config_forbidden_remote_room_directory_server_names | to_json }}


# Vector list of regex patterns of server names that continuwuity will not # Vector list of regex patterns of server names that continuwuity will not
# send messages to the client from. # send messages to the client from.
@@ -1252,7 +1252,7 @@ forbidden_remote_room_directory_server_names = {{ matrix_continuwuity_forbidden_
# example: ["reallybadserver\.tld$", "reallybadphrase", # example: ["reallybadserver\.tld$", "reallybadphrase",
# "69dollarfortnitecards"] # "69dollarfortnitecards"]
# #
ignore_messages_from_server_names = {{ matrix_continuwuity_ignore_messages_from_server_names | to_json }}
ignore_messages_from_server_names = {{ matrix_continuwuity_config_ignore_messages_from_server_names | to_json }}


# Send messages from users that the user has ignored to the client. # Send messages from users that the user has ignored to the client.
# #
@@ -1307,7 +1307,7 @@ ignore_messages_from_server_names = {{ matrix_continuwuity_ignore_messages_from_
# attack surface to your server, you are expected to be aware of the risks # attack surface to your server, you are expected to be aware of the risks
# by doing so. # by doing so.
# #
url_preview_domain_contains_allowlist = {{ matrix_continuwuity_url_preview_domain_contains_allowlist | to_json }}
url_preview_domain_contains_allowlist = {{ matrix_continuwuity_config_url_preview_domain_contains_allowlist | to_json }}


# Vector list of explicit domains allowed to send requests to for URL # Vector list of explicit domains allowed to send requests to for URL
# previews. # previews.


Loading…
Cancel
Save