Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matrix
matrix-docker-ansible-deploy
Commits
38e3ffa2
Commit
38e3ffa2
authored
6 years ago
by
Slavi Pantaleev
Browse files
Options
Download
Email Patches
Plain Diff
Rename variable (matrix_riot_web_default_identity_server_url -> matrix_identity_server_url)
parent
4f485080
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CHANGELOG.md
CHANGELOG.md
+1
-0
roles/matrix-server/defaults/main.yml
roles/matrix-server/defaults/main.yml
+2
-1
roles/matrix-server/templates/riot-web/config.json.j2
roles/matrix-server/templates/riot-web/config.json.j2
+2
-2
No files found.
CHANGELOG.md
View file @
38e3ffa2
...
...
@@ -5,6 +5,7 @@
The following playbook variables were renamed:
-
from
`matrix_nginx_riot_web_data_path`
to
`matrix_riot_web_data_path`
-
from
`matrix_riot_web_default_identity_server_url`
to
`matrix_identity_server_url`
# 2018-09-07
...
...
This diff is collapsed.
Click to expand it.
roles/matrix-server/defaults/main.yml
View file @
38e3ffa2
...
...
@@ -217,7 +217,8 @@ matrix_corporal_debug: false
# you may wish to disable this.
matrix_riot_web_enabled
:
true
matrix_riot_web_default_identity_server_url
:
"
https://{{
matrix_synapse_trusted_third_party_id_servers[0]
}}"
matrix_homeserver_url
:
"
https://{{
hostname_matrix
}}"
matrix_identity_server_url
:
"
https://{{
matrix_synapse_trusted_third_party_id_servers[0]
}}"
# Matrix mautrix is a Matrix <-> Telegram bridge
# Enable telegram bridge
...
...
This diff is collapsed.
Click to expand it.
roles/matrix-server/templates/riot-web/config.json.j2
View file @
38e3ffa2
{
"default_hs_url": "
https://{{ hostname_matrix
}}",
"default_is_url": "{{ matrix_
riot_web_default_
identity_server_url }}",
"default_hs_url": "
{{ matrix_homeserver_url
}}",
"default_is_url": "{{ matrix_identity_server_url }}",
"disable_custom_urls": true,
"disable_guests": false,
"brand": "Riot",
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment