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:
commit
c90f078a4a
3 changed files with 8 additions and 9 deletions
|
@ -2,7 +2,7 @@
|
||||||
; Manifest
|
; Manifest
|
||||||
domain="domain.tld"
|
domain="domain.tld"
|
||||||
path="/path"
|
path="/path"
|
||||||
default_home_server="matrix.org"
|
default_home_server="matrix-client.matrix.org"
|
||||||
is_public=1
|
is_public=1
|
||||||
; Checks
|
; Checks
|
||||||
pkg_linter=1
|
pkg_linter=1
|
||||||
|
@ -15,7 +15,6 @@
|
||||||
upgrade=1 from_commit=34d457d13e526997fddb8348650674a7db2247be
|
upgrade=1 from_commit=34d457d13e526997fddb8348650674a7db2247be
|
||||||
backup_restore=1
|
backup_restore=1
|
||||||
multi_instance=1
|
multi_instance=1
|
||||||
port_already_use=0
|
|
||||||
change_url=1
|
change_url=1
|
||||||
;;; Upgrade options
|
;;; Upgrade options
|
||||||
;;; Upgrade options
|
;;; Upgrade options
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"default_server_config": {
|
"default_server_config": {
|
||||||
"m.homeserver": {
|
"m.homeserver": {
|
||||||
"base_url": "__DEFAULT_HOME_SERVER__",
|
"base_url": "https://__DEFAULT_HOME_SERVER__",
|
||||||
"server_name": "matrix.org"
|
"server_name": "matrix.org"
|
||||||
},
|
},
|
||||||
"m.identity_server": {
|
"m.identity_server": {
|
||||||
|
@ -24,10 +24,10 @@
|
||||||
],
|
],
|
||||||
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
|
"bug_report_endpoint_url": "https://element.io/bugreports/submit",
|
||||||
"defaultCountryCode": "GB",
|
"defaultCountryCode": "GB",
|
||||||
"showLabsSettings": "__ENABLE_LABS__",
|
"showLabsSettings": false,
|
||||||
"features": { },
|
"features": { },
|
||||||
"default_federate": true,
|
"default_federate": true,
|
||||||
"default_theme": "__DEFAULT_THEME__",
|
"default_theme": "light",
|
||||||
"roomDirectory": {
|
"roomDirectory": {
|
||||||
"servers": [
|
"servers": [
|
||||||
"matrix.org"
|
"matrix.org"
|
||||||
|
@ -47,7 +47,7 @@
|
||||||
"breadcrumbs": true
|
"breadcrumbs": true
|
||||||
},
|
},
|
||||||
"jitsi": {
|
"jitsi": {
|
||||||
"preferredDomain": "jitsi.riot.im"
|
"preferredDomain": "meet.element.io"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,8 +46,8 @@
|
||||||
"en": "Choose a default home server",
|
"en": "Choose a default home server",
|
||||||
"fr": "Choisissez un serveur par défault"
|
"fr": "Choisissez un serveur par défault"
|
||||||
},
|
},
|
||||||
"example": "https://my-own-homeserver.tld",
|
"example": "my-own-homeserver.tld",
|
||||||
"default": "https://matrix.org"
|
"default": "matrix-client.matrix.org"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "is_public",
|
"name": "is_public",
|
||||||
|
|
Loading…
Add table
Reference in a new issue