mirror of
https://github.com/YunoHost-Apps/synapse_ynh.git
synced 2024-09-03 20:26:38 +02:00
Josue-T
GitHub
commit
b3de0f4bb4
9 changed files with 50 additions and 169 deletions
|
|
@ -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.28.1
|
||||
**Shipped version:** 0.31.1
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
setup_public=1
|
||||
upgrade=1
|
||||
upgrade=1 from_commit=a907e39c738997b0e30e9637a5b150bfecf06b18
|
||||
upgrade=1 from_commit=f050f88fbfe7bad1bf74d4584ec62ffcf28248e7
|
||||
backup_restore=1
|
||||
multi_instance=1
|
||||
incorrect_path=0
|
||||
|
|
@ -33,5 +32,3 @@
|
|||
;;; Upgrade options
|
||||
; commit=a907e39c738997b0e30e9637a5b150bfecf06b18
|
||||
name=Before multi_instance
|
||||
; commit=f050f88fbfe7bad1bf74d4584ec62ffcf28248e7
|
||||
name=Old version package
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
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
|
||||
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.31.1/matrix-synapse_0.31.1-jessie-bin1_armv7l.tar.gz
|
||||
SOURCE_SUM=77b12b4135e99da518e0c7910e3f929daf9200cea83ed5853f7712c77435a5bc
|
||||
# (Optional) Program to check the integrity (sha256sum, md5sum...)
|
||||
# default: sha256
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
11
conf/armv7_stretch.src
Normal file
11
conf/armv7_stretch.src
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v0.31.1/matrix-synapse_0.31.1-stretch-bin1_armv7l.tar.gz
|
||||
SOURCE_SUM=bed38a43b7e770234f5c3278066316fa261486a885913248c0750088309d87fd
|
||||
# (Optional) Program to check the integrity (sha256sum, md5sum...)
|
||||
# default: sha256
|
||||
SOURCE_SUM_PRG=sha256sum
|
||||
# (Optional) Archive format
|
||||
# default: tar.gz
|
||||
SOURCE_FORMAT=tar.gz
|
||||
# (Optional) Put false if sources are directly in the archive root
|
||||
# default: true
|
||||
SOURCE_IN_SUBDIR=true
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.28.1.tar.gz
|
||||
SOURCE_SUM=3f2238172341506614a1b6ba5275bee79b418fee639a7fef3917b1188c515e70
|
||||
SOURCE_URL=https://github.com/matrix-org/synapse/archive/v0.31.1.tar.gz
|
||||
SOURCE_SUM=0408b9f4fc91a90e138c19f0bf9851dcd30c970bd7d6c0bc7a0f498f39b12ac9
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
"en": "Instant messaging server who use matrix",
|
||||
"fr": "Un serveur de messagerie instantané basé sur matrix"
|
||||
},
|
||||
"version": "0.28.1~ynh1",
|
||||
"version": "0.31.1~ynh1",
|
||||
"url": "http://matrix.org",
|
||||
"license": "Apache-2.0",
|
||||
"maintainer": {
|
||||
|
|
|
|||
25
pull_request_template.md
Normal file
25
pull_request_template.md
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
## Problem
|
||||
- *Description of why you made this PR*
|
||||
|
||||
## Solution
|
||||
- *And how you fix that*
|
||||
|
||||
## PR Status
|
||||
- [ ] Code finished.
|
||||
- [ ] Tested with Package_check.
|
||||
- [ ] Fix or enhancement tested.
|
||||
- [ ] Upgrade from last version tested.
|
||||
- [ ] Can be reviewed and tested.
|
||||
|
||||
## Validation
|
||||
---
|
||||
*Minor decision*
|
||||
- **Upgrade previous version** :
|
||||
- [ ] **Code review** :
|
||||
- [ ] **Approval (LGTM)** :
|
||||
- [ ] **Approval (LGTM)** :
|
||||
- **CI succeeded** :
|
||||
[/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20-BRANCH-%20(Official)/) *Please replace '-BRANCH-' in this link for a PR from a local branch.*
|
||||
or
|
||||
[/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/synapse_ynh%20PR-NUM-%20(Official_fork)/) *Replace '-NUM-' by the PR number in this link for a PR from a forked repository.*
|
||||
When the PR is marked as ready to merge, you have to wait for 3 days before really merging it.
|
||||
|
|
@ -142,7 +142,7 @@ mkdir -p $final_path
|
|||
# For any update do it in all files
|
||||
if [ -n "$(uname -m | grep arm)" ]
|
||||
then
|
||||
ynh_setup_source $final_path/ "armv7"
|
||||
ynh_setup_source $final_path/ "armv7_$(lsb_release --codename --short)"
|
||||
else
|
||||
# Install virtualenv if it don't exist
|
||||
test -e $final_path/bin || virtualenv -p python2.7 $final_path
|
||||
|
|
|
|||
166
scripts/upgrade
166
scripts/upgrade
|
|
@ -47,14 +47,10 @@ cli_port=$(ynh_app_setting_get $app cli_port)
|
|||
# ENSURE DOWNWARD COMPATIBILITY
|
||||
#=================================================
|
||||
|
||||
# To be sure that the migration is sucessfull we check that the old synapse version is compatible with the synapse_port_db script.
|
||||
# We need to make the user able to do the migration to the new package.
|
||||
# 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.28") != 1 ]]
|
||||
# Following the discussion here https://github.com/YunoHost-Apps/synapse_ynh/pull/51 we decided to remove definitely the support of the old package migration.
|
||||
if [[ -z $synapse_old_version ]]
|
||||
then
|
||||
ynh_die "Update from this synapse version is not available now. You need to wait for the next update."
|
||||
ynh_die "Update from this synapse version is not available. You need to remove this package and reinstall the new package version."
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
|
|
@ -74,79 +70,7 @@ then
|
|||
fi
|
||||
|
||||
#=================================================
|
||||
# UPGRADE FROM DIFFERENTS PACKAGE EVOLUTION
|
||||
#=================================================
|
||||
# MIGRATION 1 : UPGRADE FROM OLD PACKAGE VERSION
|
||||
# DEBIAN PACKAGE-> PYTHON VIRTUALENVIRONNEMENT
|
||||
# SQLITE -> POSTGRESQL
|
||||
# PART NO 1
|
||||
#=================================================
|
||||
# Actually this package use pythonvirtualenvironnement. The old package used the debian package. So if the app is not already migrated from the old package version we need to migrade the app from the debian package to a python virtualenvironnement. In the same time the package migrated from sqlite to postgresql for the database. So we do these both things in the same time.
|
||||
|
||||
if [[ -z $synapse_old_version ]]
|
||||
then
|
||||
|
||||
#=================================================
|
||||
# UPDATE SETTINGS
|
||||
#=================================================
|
||||
|
||||
path_url="/_matrix"
|
||||
domain=$(ynh_app_setting_get $app domain)
|
||||
final_path="/opt/yunohost/matrix-synapse"
|
||||
ynh_app_setting_set $app special_domain $domain
|
||||
ynh_app_setting_set $app special_path $path_url
|
||||
ynh_app_setting_set $app final_path $final_path
|
||||
ynh_app_setting_delete $app domain
|
||||
ynh_app_setting_delete $app path
|
||||
ynh_app_setting_delete $app skipped_uris
|
||||
|
||||
#=================================================
|
||||
# REMOVE OLD DEPENDDANCE
|
||||
#=================================================
|
||||
|
||||
ynh_secure_remove /etc/apt/sources.list.d/matrix.list
|
||||
ynh_package_autoremove --purge matrix-synapse python-matrix-synapse-ldap3 || true
|
||||
|
||||
# If we don't remove these line in dpkg config, dpkg fail on every new package install
|
||||
sudo sed --in-place ':a;N;$!ba;s@matrix-synapse nogroup 755 /var/lib/matrix-synapse\n@@g' /var/lib/dpkg/statoverride
|
||||
sudo sed --in-place ':a;N;$!ba;s@matrix-synapse nogroup 755 /var/log/matrix-synapse\n@@g' /var/lib/dpkg/statoverride
|
||||
sudo sed --in-place ':a;N;$!ba;s@matrix-synapse nogroup 755 /etc/matrix-synapse\n@@g' /var/lib/dpkg/statoverride
|
||||
|
||||
#=================================================
|
||||
# INSTALL NEW DEPENDENCIES
|
||||
#=================================================
|
||||
|
||||
# add new package as dependance and install dependance
|
||||
# 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 virtualenv
|
||||
|
||||
#=================================================
|
||||
# CREATE A POSTGRESQL DATABASE
|
||||
#=================================================
|
||||
|
||||
synapse_db_pwd=$(ynh_string_random 30)
|
||||
ynh_app_setting_set $app synapse_db_pwd $synapse_db_pwd
|
||||
|
||||
# Create postgresql database
|
||||
ynh_psql_test_if_first_run
|
||||
ynh_psql_create_user $synapse_db_user $synapse_db_pwd
|
||||
ynh_psql_execute_as_root \
|
||||
"CREATE DATABASE $synapse_db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $synapse_db_user;"
|
||||
|
||||
#=================================================
|
||||
# CREATE EMPTY DIR FOR SYNAPSE
|
||||
#=================================================
|
||||
|
||||
# WARRNING : theses command are used in INSTALL, UPGRADE
|
||||
# For any update do it in all files
|
||||
mkdir -p /var/lib/matrix-$app
|
||||
mkdir -p /var/log/matrix-$app
|
||||
mkdir -p /etc/matrix-$app/conf.d
|
||||
mkdir -p $final_path
|
||||
fi
|
||||
|
||||
# STANDARD UPGRADE STEPS
|
||||
#=================================================
|
||||
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
||||
#=================================================
|
||||
|
|
@ -158,7 +82,7 @@ fi
|
|||
|
||||
if [ -n "$(uname -m | grep arm)" ]
|
||||
then
|
||||
ynh_setup_source $final_path/ "armv7"
|
||||
ynh_setup_source $final_path/ "armv7_$(lsb_release --codename --short)"
|
||||
else
|
||||
# Install virtualenv if it don't exist
|
||||
test -e $final_path/bin || virtualenv -p python2.7 $final_path
|
||||
|
|
@ -191,8 +115,6 @@ else
|
|||
deactivate
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# STANDARD UPGRADE STEPS
|
||||
#=================================================
|
||||
# UPDATE SYNAPSE CONFIG
|
||||
#=================================================
|
||||
|
|
@ -227,81 +149,7 @@ ynh_store_file_checksum "$homeserver_config_path"
|
|||
ynh_store_file_checksum "/etc/matrix-$app/log.yaml"
|
||||
|
||||
#=================================================
|
||||
# MIGRATION 1 : UPGRADE FROM OLD PACKAGE VERSION
|
||||
# DEBIAN PACKAGE-> PYTHON VIRTUALENVIRONNEMENT
|
||||
# SQLITE -> POSTGRESQL
|
||||
# PART NO 2
|
||||
#=================================================
|
||||
|
||||
if [[ -z $synapse_old_version ]]
|
||||
then
|
||||
|
||||
#=================================================
|
||||
# UPDATE SSOWAT CONF
|
||||
#=================================================
|
||||
|
||||
cp ../conf/add_sso_conf.py $final_path
|
||||
cp ../conf/remove_sso_conf.py $final_path
|
||||
python3 $final_path/add_sso_conf.py || echo "Error while sso config, please add '/_matrix' in /etc/ssowat/conf.json.persistent"
|
||||
|
||||
#=================================================
|
||||
# CREATE DEDICATED USER
|
||||
#=================================================
|
||||
|
||||
ynh_system_user_create $synapse_user /var/lib/matrix-synapse
|
||||
adduser $synapse_user ssl-cert
|
||||
adduser turnserver ssl-cert
|
||||
|
||||
# In the old synapse instance we stored the dh.pem in /etc/yunohost/certs/DOMAIN.TLD/ but it was problematics with lets'encrypt witch made a link to the key. While the letsencrypt key was changed the dh.pem file was lost. So we decided to move to /etc/matrix-synapse/ witch is a directory witch is not managed by any other component.
|
||||
# Here we check if the dh.pem file is already moved. If not we try to copy the file from the old place. If the file in the old place was already removed (by letsencrypt) we create a new one.
|
||||
test -e /etc/matrix-$app/dh.pem || \
|
||||
cp /etc/yunohost/certs/$domain/dh.pem /etc/matrix-$app/dh.pem || \
|
||||
openssl dhparam -out /etc/matrix-$app/dh.pem 2048 > /dev/null
|
||||
|
||||
#=================================================
|
||||
# SETUP SYSTEMD
|
||||
#=================================================
|
||||
|
||||
ynh_secure_remove /etc/init.d/matrix-synapse
|
||||
ynh_secure_remove /lib/systemd/system/matrix-synapse.service
|
||||
ynh_secure_remove /etc/systemd/system/matrix-synapse.service
|
||||
systemctl daemon-reload
|
||||
systemctl disable matrix-synapse.service
|
||||
|
||||
cp ../conf/default_matrix-synapse /etc/default/matrix-synapse
|
||||
cp ../conf/matrix-synapse.service /etc/systemd/system/matrix-synapse.service
|
||||
ynh_replace_string __APP__ $app /etc/systemd/system/matrix-synapse.service
|
||||
systemctl daemon-reload
|
||||
systemctl enable matrix-synapse.service
|
||||
|
||||
#=================================================
|
||||
# ADVERTISE SERVICE IN ADMIN PANEL
|
||||
#=================================================
|
||||
|
||||
yunohost service add matrix-$app -l "/var/log/matrix-$app/homeserver.log"
|
||||
yunohost service add coturn-$app
|
||||
|
||||
#=================================================
|
||||
# MIGRATE DATABASE
|
||||
#=================================================
|
||||
|
||||
# We get the last version of the synapse_port_db script because an old version could be buggy.
|
||||
cp ../sources/synapse_port_db /opt/yunohost/matrix-synapse/bin/synapse_port_db
|
||||
|
||||
# Fix "PS1: unbound variable" On ARM architecture
|
||||
PS1=""
|
||||
cp ../conf/virtualenv_activate $final_path/bin/activate
|
||||
ynh_replace_string __FINAL_PATH__ $final_path $final_path/bin/activate
|
||||
|
||||
# Migrate database (in virtualenv)
|
||||
source $final_path/bin/activate
|
||||
/opt/yunohost/matrix-synapse/bin/synapse_port_db --sqlite-database /var/lib/matrix-synapse/homeserver.db \
|
||||
--postgres-config /etc/matrix-synapse/homeserver.yaml
|
||||
deactivate
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# MIGRATION 2 : MULTINSTANCE SUPPORT
|
||||
# MIGRATION 1 : MULTINSTANCE SUPPORT
|
||||
#=================================================
|
||||
|
||||
if [[ ! -e /etc/matrix-$app/coturn.conf ]]
|
||||
|
|
@ -339,7 +187,7 @@ then
|
|||
fi
|
||||
|
||||
#=================================================
|
||||
# MIGRATION 3 : USE STANDARD ACCESS FOR CERTIFCATE
|
||||
# MIGRATION 2 : USE STANDARD ACCESS FOR CERTIFCATE
|
||||
# AND USE INDEPENDANT DH FILE
|
||||
#=================================================
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue