YunoHost-Apps/synapse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/synapse_ynh.git synced 2024-09-03 20:26:38 +02:00
Code Issues Activity Actions

Merge branch 'testing' into master

Browse source
This commit is contained in:
Josué Tille 2020-10-13 23:49:38 +02:00
commit 6fe4b0afb7
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
9 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -14,7 +14,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org)
**Shipped version:** 1.19.3
**Shipped version:** 1.20.1
## Configuration
@ -29,7 +29,7 @@ The script to build the binary is also available.
### Web client
If you want a web client you can also install riot with this package: https://github.com/YunoHost-Apps/riot_ynh .
If you want a web client you can also install riot with this package: https://github.com/YunoHost-Apps/element_ynh .
### Access by federation

4
actions.toml
View file

@ -21,10 +21,10 @@ description = "Close the ports range 49153:49193 with TCP and UDP. (Undo \"Open
[set_admin_user]
name = "Set a user as admin"
command = "[[ \"$(su --command=\"psql matrix_synapse\" postgres <<< \"UPDATE users SET admin = 1 WHERE name = '@$YNH_ACTION_USERNAME:$(yunohost app setting $YNH_APP_INSTANCE_NAME domain)'\")\" == 'UPDATE 1' ]]"
command = "[[ \"$(su --command=\"psql matrix_synapse\" postgres <<< \"UPDATE users SET admin = 1 WHERE name = '@$YNH_ACTION_USERNAME:$(yunohost app setting $YNH_APP_INSTANCE_NAME server_name)'\")\" == 'UPDATE 1' ]]"
user = "root"
accepted_return_codes = [0]
description = "Set a synapse user as admin in the synapse server. It probably usefull only to manage the community function."
description = "Set a synapse user as admin in the synapse server. It is mainly required to manage the community function."
[set_admin_user.arguments]
[set_admin_user.arguments.username]

4
conf/armv7_buster.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.19.3/matrix-synapse_1.19.3-buster-bin1_armv7l.tar.gz
SOURCE_SUM=34738e934c99aeb784682190a8852ad42698c72554a5249093a3110c221bbb73
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.20.1/matrix-synapse_1.20.1-buster-bin1_armv7l.tar.gz
SOURCE_SUM=89a895a4aace87f3a7782aff0589dbc61a6dd8beb08f7d72715e3e4670e28a97
# (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256
SOURCE_SUM_PRG=sha256sum

4
conf/armv7_stretch.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.19.3/matrix-synapse_1.19.3-stretch-bin1_armv7l.tar.gz
SOURCE_SUM=35b16127fe402aa0f069e01038f1f30bbf6ee9b81c666a91d7d272259b69c3b3
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.20.1/matrix-synapse_1.20.1-stretch-bin1_armv7l.tar.gz
SOURCE_SUM=c6bb1e8f29aeaca836eccf56067a26835db7881a767d99775e572393438d4cc7
# (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256
SOURCE_SUM_PRG=sha256sum

5
conf/server_name.conf
View file

@ -5,8 +5,9 @@ location /.well-known/matrix/server {
}
location /.well-known/matrix/client {
return 200 '{"im.vector.riot.jitsi":
{"preferredDomain": "__JITSI_SERVER_ADDR__"}
return 200 '{
"m.homeserver": { "base_url": "https://__DOMAIN__" },
"im.vector.riot.jitsi": {"preferredDomain": "__JITSI_SERVER_ADDR__"}
}';
add_header Content-Type application/json;
add_header Access-Control-Allow-Origin '*';

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Instant messaging server which uses Matrix",
"fr": "Un serveur de messagerie instantané basé sur Matrix"
},
"version": "1.19.3~ynh1",
"version": "1.20.1~ynh1",
"url": "http://matrix.org",
"license": "Apache-2.0",
"maintainer": {

1
scripts/install
View file

@ -175,6 +175,7 @@ ynh_script_progression --message="Setting up source files..." --weight=50
mkdir -p /var/lib/matrix-$app
mkdir -p /var/log/matrix-$app
mkdir -p /etc/matrix-$app/conf.d
mkdir -p /etc/matrix-$app/app-service
# Install synapse in virtualenv
install_sources

1
scripts/restore
View file

@ -77,6 +77,7 @@ ynh_install_app_dependencies $dependances
ynh_script_progression --message="Restoring directory and configuration..." --weight=10
ynh_restore
mkdir -p /etc/matrix-$app/app-service
# Check that the good python version is installed
# If not upgrade the source

4
scripts/upgrade
View file

@ -323,6 +323,7 @@ ynh_add_fpm_config
# Create .well-known redirection for access by federation
if yunohost --output-as plain domain list | grep -q "^$server_name$"
then
ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf"
cp ../conf/server_name.conf /etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf
ynh_replace_string --match_string=__DOMAIN__ --replace_string=$domain --target_file="/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf"
ynh_replace_string --match_string=__PORT__ --replace_string=$synapse_tls_port --target_file="/etc/nginx/conf.d/${server_name}.d/${app}_server_name.conf"
@ -385,6 +386,9 @@ cp ../sources/update_synapse_for_appservice.sh $final_path/
ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file="$final_path/Coturn_config_rotate.sh"
ynh_replace_string --match_string=__APP__ --replace_string=$app --target_file="$final_path/update_synapse_for_appservice.sh"
# Ensure app-service folder has exists (Migration)
mkdir -p /etc/matrix-$app/app-service
#=================================================
# ADVERTISE SERVICE IN ADMIN PANEL
#=================================================