1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/element_ynh.git synced 2024-09-03 18:36:08 +02:00

Merge branch 'Upgrade-config' into config_panel

This commit is contained in:
ericgaspar 2022-01-14 10:55:12 +01:00
commit c90f078a4a
No known key found for this signature in database
GPG key ID: 574F281483054D44
3 changed files with 8 additions and 9 deletions

View file

@ -2,7 +2,7 @@
; Manifest
domain="domain.tld"
path="/path"
default_home_server="matrix.org"
default_home_server="matrix-client.matrix.org"
is_public=1
; Checks
pkg_linter=1
@ -15,7 +15,6 @@
upgrade=1 from_commit=34d457d13e526997fddb8348650674a7db2247be
backup_restore=1
multi_instance=1
port_already_use=0
change_url=1
;;; Upgrade options
;;; Upgrade options
@ -23,4 +22,4 @@
name=34d457d13e526997fddb8348650674a7db2247be
manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

View file

@ -1,7 +1,7 @@
{
"default_server_config": {
"m.homeserver": {
"base_url": "__DEFAULT_HOME_SERVER__",
"base_url": "https://__DEFAULT_HOME_SERVER__",
"server_name": "matrix.org"
},
"m.identity_server": {
@ -24,10 +24,10 @@
],
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
"defaultCountryCode": "GB",
"showLabsSettings": "__ENABLE_LABS__",
"showLabsSettings": false,
"features": { },
"default_federate": true,
"default_theme": "__DEFAULT_THEME__",
"default_theme": "light",
"roomDirectory": {
"servers": [
"matrix.org"
@ -47,7 +47,7 @@
"breadcrumbs": true
},
"jitsi": {
"preferredDomain": "jitsi.riot.im"
"preferredDomain": "meet.element.io"
}
}

View file

@ -46,8 +46,8 @@
"en": "Choose a default home server",
"fr": "Choisissez un serveur par défault"
},
"example": "https://my-own-homeserver.tld",
"default": "https://matrix.org"
"example": "my-own-homeserver.tld",
"default": "matrix-client.matrix.org"
},
{
"name": "is_public",