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 pull request #386 from YunoHost-Apps/fix_app_service

Browse source 
Fix app service config file
This commit is contained in:
Josue-T 2023-06-06 21:37:33 +02:00 committed by GitHub
commit 9740fc719a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -21,7 +21,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)
**Shipped version:** 1.84.1~ynh1 **Shipped version:** 1.84.1~ynh2
## Disclaimers / important information ## Disclaimers / important information
## Configuration ## Configuration

2
README_fr.md
View file

@ -21,7 +21,7 @@ Instant messaging server matrix network.
Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org) Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)
**Version incluse :** 1.84.1~ynh1 **Version incluse :** 1.84.1~ynh2
## Avertissements / informations importantes ## Avertissements / informations importantes
## Configuration ## Configuration

2
manifest.json
View file

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

9
scripts/upgrade
View file

@ -380,7 +380,14 @@ ynh_add_config --template="../sources/update_synapse_for_appservice.sh" --destin
# Ensure app-service folder has exists and the config file exit (Migration) # Ensure app-service folder has exists and the config file exit (Migration)
mkdir -p /etc/matrix-$app/app-service mkdir -p /etc/matrix-$app/app-service
test -e /etc/matrix-$app/conf.d/app_service.yaml || touch /etc/matrix-$app/conf.d/app_service.yaml if [ -e /etc/matrix-$app/conf.d/app_service.yaml ]; then
# ensure that the file is empty if no app service are installed (fix issue #385)
if [ ! "$(ls -A /etc/matrix-$app/app-service)" ]; then
echo "" > /etc/matrix-$app/conf.d/app_service.yaml
fi
else
touch /etc/matrix-$app/conf.d/app_service.yaml
fi
#================================================= #=================================================
# ADVERTISE SERVICE IN ADMIN PANEL # ADVERTISE SERVICE IN ADMIN PANEL

2
sources/update_synapse_for_appservice.sh
View file

@ -8,6 +8,8 @@ cp $service_config_file /tmp/app_service_backup.yaml
if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then
echo "app_service_config_files:" > $service_config_file echo "app_service_config_files:" > $service_config_file
else
echo "" > $service_config_file
fi fi
for f in $(ls /etc/matrix-$app/app-service/); do for f in $(ls /etc/matrix-$app/app-service/); do
echo " - /etc/matrix-$app/app-service/$f" >> $service_config_file echo " - /etc/matrix-$app/app-service/$f" >> $service_config_file