diff --git a/README.md b/README.md index cde3dc0..09b2047 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,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:** 0.27.2 +**Shipped version:** 0.28.1 Configuration ------------- diff --git a/check_process b/check_process index 4f1b45b..810ba25 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=a62bce7dbc6bc0e1f1b4e872286ff124747ea009 + upgrade=1 from_commit=a907e39c738997b0e30e9637a5b150bfecf06b18 upgrade=1 from_commit=f050f88fbfe7bad1bf74d4584ec62ffcf28248e7 backup_restore=1 multi_instance=1 @@ -31,7 +31,7 @@ Level 9=0 Level 10=0 ;;; Upgrade options - ; commit=a62bce7dbc6bc0e1f1b4e872286ff124747ea009 + ; commit=a907e39c738997b0e30e9637a5b150bfecf06b18 name=Before multi_instance ; commit=f050f88fbfe7bad1bf74d4584ec62ffcf28248e7 name=Old version package diff --git a/conf/armv7.src b/conf/armv7.src index a58496f..c2ad3b6 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,6 +1,5 @@ - -SOURCE_URL=https://github.com/Josue-T/synapse_python_build/releases/download/v0.27.2/matrix-synapse_0.27.2-bin1_armv7l.tar.gz -SOURCE_SUM=4dfba2316986ad0e3df7d3a14c79006d3f2dc48ef062fc14bb1614f4af99a2fb +SOURCE_URL=https://github.com/Josue-T/synapse_python_build/releases/download/v0.28.1/matrix-synapse_0.28.1-bin1_armv7l.tar.gz +SOURCE_SUM=c23baff6b198d80ac8938e95d6d79cd7ff5ca7996119af1ddd2936ee313f9a87 # (Optional) Program to check the integrity (sha256sum, md5sum...) # default: sha256 SOURCE_SUM_PRG=sha256sum diff --git a/conf/python_source.src b/conf/python_source.src index f119177..f8d573b 100644 --- a/conf/python_source.src +++ b/conf/python_source.src @@ -1,2 +1,2 @@ -SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.27.2.tar.gz -SOURCE_SUM=01080b19f66779335eb68d203c34a4caf681d3c3ed66a1ebd923dcd0833effa2 +SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.28.1.tar.gz +SOURCE_SUM=3f2238172341506614a1b6ba5275bee79b418fee639a7fef3917b1188c515e70 \ No newline at end of file diff --git a/manifest.json b/manifest.json index a5da53a..572f862 100644 --- a/manifest.json +++ b/manifest.json @@ -9,7 +9,7 @@ "en": "Instant messaging server who use matrix", "fr": "Un serveur de messagerie instantané basé sur matrix" }, - "version": "0.27.2~ynh1", + "version": "0.28.1~ynh1", "url": "http://matrix.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/install b/scripts/install index 4fae671..1bde217 100644 --- a/scripts/install +++ b/scripts/install @@ -100,7 +100,6 @@ test ! -e /etc/matrix-$app/dh.pem && \ # WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl -pip install --upgrade pip pip install --upgrade virtualenv #================================================= diff --git a/scripts/restore b/scripts/restore index cf0f468..9274f69 100644 --- a/scripts/restore +++ b/scripts/restore @@ -60,7 +60,6 @@ ynh_restore # WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl -pip install --upgrade pip pip install --upgrade virtualenv #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ee771bc..6773c22 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -52,7 +52,7 @@ cli_port=$(ynh_app_setting_get $app cli_port) # While the official synapse version is updated, the idea is to test the migration with the new version. # If the migration pass we can update this next line with the new synapse package. # For more information see comment : https://github.com/YunoHost-Apps/synapse_ynh/pull/40#pullrequestreview-108680051 -if [[ -z $synapse_old_version ]] && [[ $(dpkg -l | grep -c -E "ii.*matrix-synapse.*0.27") != 1 ]] && [[ $(dpkg -l | grep -c -E "ii.*matrix-synapse.*0.26") != 1 ]] +if [[ -z $synapse_old_version ]] && [[ $(dpkg -l | grep -c -E "ii.*matrix-synapse.*0.27") != 1 ]] && [[ $(dpkg -l | grep -c -E "ii.*matrix-synapse.*0.28") != 1 ]] then ynh_die "Update from this synapse version is not available now. You need to wait for the next update." fi @@ -120,7 +120,6 @@ then # WARRNING : theses command are used in INSTALL, UPGRADE, RESTORE # For any update do it in all files ynh_install_app_dependencies coturn build-essential python2.7-dev libffi-dev python-pip python-setuptools sqlite3 libssl-dev python-virtualenv libxml2-dev libxslt1-dev python-lxml libjpeg-dev libpq-dev postgresql acl - pip install --upgrade pip pip install --upgrade virtualenv #================================================= @@ -171,7 +170,6 @@ else # We set all necessary environement variable to create a python virtualenvironnement. source $final_path/bin/activate - pip install --upgrade pip pip install --upgrade setuptools pip install --upgrade cffi ndg-httpsclient psycopg2 lxml