diff --git a/README.md b/README.md index c700288..683e7f2 100644 --- a/README.md +++ b/README.md @@ -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.11.1 +**Shipped version:** 1.12.3 ## Configuration diff --git a/check_process b/check_process index 2c18177..03fa32f 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=db374d2bff981d2660ebdac52ee77c684383c00d - upgrade=1 from_commit=0b8f2d4423bc48a1509dc0be4e231f02a0046eca + upgrade=1 from_commit=0571cc85334408a98f6766881b580a040fa6398a backup_restore=1 multi_instance=1 incorrect_path=0 @@ -24,5 +24,5 @@ ;;; Upgrade options ; commit=db374d2bff981d2660ebdac52ee77c684383c00d name=Fix postgresql helper from old_version_for_CI_2 branch - ; commit=0b8f2d4423bc48a1509dc0be4e231f02a0046eca - name=Migrate from self signed certificate to cert managed by Yunohost + ; commit=0571cc85334408a98f6766881b580a040fa6398a + name=Migrate from self signed certificate to cert managed by Yunohost from old_version_for_CI_3 branch diff --git a/conf/armv7_stretch.src b/conf/armv7_stretch.src index 6bcd6d3..e203c65 100644 --- a/conf/armv7_stretch.src +++ b/conf/armv7_stretch.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.11.1/matrix-synapse_1.11.1-stretch-bin1_armv7l.tar.gz -SOURCE_SUM=d793d49c561898330ce62bc7c1620b71467d611c375c41b697d2fd3064ddbee4 +SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.12.3/matrix-synapse_1.12.3-stretch-bin1_armv7l.tar.gz +SOURCE_SUM=b18e314d312ccd69fa7aec295374515cd669d62041bf7ee1a304bc77105f9eda # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/manifest.json b/manifest.json index 4be4080..6632ca6 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "1.11.1~ynh1", + "version": "1.12.3~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index cae73e0..58285fe 100644 --- a/scripts/install +++ b/scripts/install @@ -182,6 +182,13 @@ mkdir -p $final_path if [ -n "$(uname -m | grep arm)" ] then ynh_setup_source --dest_dir=$final_path/ --source_id="armv7_$(lsb_release --codename --short)" + + # Fix multi-instance support + for f in $(ls $final_path/bin); do + if ! [[ $f =~ "__" ]]; then + ynh_replace_special_string --match_string='#!/opt/yunohost/matrix-synapse' --replace_string='#!'$final_path --target_file=$final_path/bin/$f + fi + done else # Install virtualenv if it don't exist test -e $final_path/bin/python3 || python3 -m venv $final_path diff --git a/scripts/upgrade b/scripts/upgrade index 031402d..cf4ba14 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,7 +142,15 @@ then ynh_secure_remove --file=$final_path/lib ynh_secure_remove --file=$final_path/include ynh_secure_remove --file=$final_path/share + ynh_setup_source --dest_dir=$final_path/ --source_id="armv7_$(lsb_release --codename --short)" + + # Fix multi-instance support + for f in $(ls $final_path/bin); do + if ! [[ $f =~ "__" ]]; then + ynh_replace_special_string --match_string='#!/opt/yunohost/matrix-synapse' --replace_string='#!'$final_path --target_file=$final_path/bin/$f + fi + done else # Install virtualenv if it don't exist test -e $final_path/bin/python3 || python3 -m venv $final_path @@ -155,7 +163,7 @@ then source $final_path/bin/activate pip3 install --upgrade setuptools wheel pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 - pip3 install --upgrade matrix-synapse==$upstream_version matrix-synapse-ldap3 + pip3 install --upgrade 'Twisted>=20.3.0' matrix-synapse==$upstream_version matrix-synapse-ldap3 # This function was defined when we called "source $final_path/bin/activate". With this function we undo what "$final_path/bin/activate" does deactivate