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 #428 from YunoHost-Apps/fix_sso_update

Browse source 
Fix sso update
This commit is contained in:
Josue-T 2023-11-22 20:53:32 +01:00 committed by GitHub
commit e1471c904f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 50 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
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.95.0~ynh1 **Shipped version:** 1.96.1~ynh1
## Disclaimers / important information ## Disclaimers / important information
## Configuration ## Configuration
@ -210,6 +210,7 @@ Before installing a second instance of the app it's really recommended to update
* Official app website: <https://matrix.org/> * Official app website: <https://matrix.org/>
* Upstream app code repository: <https://github.com/matrix-org/synapse> * Upstream app code repository: <https://github.com/matrix-org/synapse>
* YunoHost Store: <https://apps.yunohost.org/app/synapse>
* Report a bug: <https://github.com/YunoHost-Apps/synapse_ynh/issues> * Report a bug: <https://github.com/YunoHost-Apps/synapse_ynh/issues>
## Developer info ## Developer info

3
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.95.0~ynh1 **Version incluse :** 1.96.1~ynh1
## Avertissements / informations importantes ## Avertissements / informations importantes
## Configuration ## Configuration
@ -210,6 +210,7 @@ Before installing a second instance of the app it's really recommended to update
* Site officiel de l’app : <https://matrix.org/> * Site officiel de l’app : <https://matrix.org/>
* Dépôt de code officiel de l’app : <https://github.com/matrix-org/synapse> * Dépôt de code officiel de l’app : <https://github.com/matrix-org/synapse>
* YunoHost Store: <https://apps.yunohost.org/app/synapse>
* Signaler un bug : <https://github.com/YunoHost-Apps/synapse_ynh/issues> * Signaler un bug : <https://github.com/YunoHost-Apps/synapse_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs

4
conf/armv7_bookworm.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.95.0/matrix-synapse_1.95.0-bookworm-bin1_armv7l.tar.gz SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.96.1/matrix-synapse_1.96.1-bookworm-bin1_armv7l.tar.gz
SOURCE_SUM=1a1d9248b139f67d23a89a20745d14d88c5b8627f76872d7f94f66952b5f1253 SOURCE_SUM=4c084d839a3aa058f950c5abda85554b1635b8effcd77bd7a471a21f0a22a9a2
# (Optional) Program to check the integrity (sha256sum, md5sum...) # (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256 # default: sha256
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum

4
conf/armv7_bullseye.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.95.0/matrix-synapse_1.95.0-bullseye-bin1_armv7l.tar.gz SOURCE_URL=https://github.com/YunoHost-Apps/synapse_python_build/releases/download/v1.96.1/matrix-synapse_1.96.1-bullseye-bin1_armv7l.tar.gz
SOURCE_SUM=97e9942bea9bcecc2a75228255a1824298300302559a9332e50816fa54193738 SOURCE_SUM=09fe388a344ecb71acb63c15ea4451ddcc5df6fbef1644f030e49ec35c311068
# (Optional) Program to check the integrity (sha256sum, md5sum...) # (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256 # default: sha256
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum

2
conf/nginx.conf
View file

@ -10,7 +10,7 @@ location __PATH__/ {
location __PATH__/cas_server.php { location __PATH__/cas_server.php {
alias /var/www/__APP__/; alias /var/www/__APP__/;
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/run/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_pass unix:/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
include fastcgi_params; include fastcgi_params;
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;

32
conf/requirement_bookworm.txt
View file

@ -6,8 +6,8 @@ bleach==6.1.0
canonicaljson==2.0.0 canonicaljson==2.0.0
certifi==2023.7.22 certifi==2023.7.22
cffi==1.16.0 cffi==1.16.0
charset-normalizer==3.3.1 charset-normalizer==3.3.2
constantly==15.1.0 constantly==23.10.4
cryptography==41.0.5 cryptography==41.0.5
hyperlink==21.0.0 hyperlink==21.0.0
idna==3.4 idna==3.4
@ -15,44 +15,44 @@ ijson==3.2.3
immutabledict==3.0.0 immutabledict==3.0.0
incremental==22.10.0 incremental==22.10.0
Jinja2==3.1.2 Jinja2==3.1.2
jsonschema==4.19.1 jsonschema==4.20.0
jsonschema-specifications==2023.7.1 jsonschema-specifications==2023.11.1
ldap3==2.9.1 ldap3==2.9.1
lxml==4.9.3 lxml==4.9.3
MarkupSafe==2.1.3 MarkupSafe==2.1.3
matrix-common==1.3.0 matrix-common==1.3.0
matrix-synapse==1.95.0 matrix-synapse==1.96.1
matrix-synapse-ldap3==0.3.0 matrix-synapse-ldap3==0.3.0
msgpack==1.0.7 msgpack==1.0.7
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
netaddr==0.9.0 netaddr==0.9.0
packaging==23.2 packaging==23.2
phonenumbers==8.13.23 phonenumbers==8.13.25
Pillow==10.1.0 Pillow==10.1.0
prometheus-client==0.17.1 prometheus-client==0.18.0
psycopg2==2.9.9 psycopg2==2.9.9
pyasn1==0.5.0 pyasn1==0.5.0
pyasn1-modules==0.3.0 pyasn1-modules==0.3.0
pycparser==2.21 pycparser==2.21
pydantic==2.4.2 pydantic==2.5.1
pydantic_core==2.10.1 pydantic_core==2.14.3
pymacaroons==0.13.0 pymacaroons==0.13.0
PyNaCl==1.5.0 PyNaCl==1.5.0
pyOpenSSL==23.2.0 pyOpenSSL==23.3.0
PyYAML==6.0.1 PyYAML==6.0.1
referencing==0.30.2 referencing==0.31.0
requests==2.31.0 requests==2.31.0
rpds-py==0.10.6 rpds-py==0.13.0
semantic-version==2.10.0 semantic-version==2.10.0
service-identity==23.1.0 service-identity==23.1.0
setuptools-rust==1.7.0 setuptools-rust==1.8.1
signedjson==1.1.4 signedjson==1.1.4
six==1.16.0 six==1.16.0
sortedcontainers==2.4.0 sortedcontainers==2.4.0
treq==22.2.0 treq==23.11.0
Twisted==23.8.0 Twisted==23.10.0
typing_extensions==4.8.0 typing_extensions==4.8.0
unpaddedbase64==2.1.0 unpaddedbase64==2.1.0
urllib3==2.0.7 urllib3==2.1.0
webencodings==0.5.1 webencodings==0.5.1
zope.interface==6.1 zope.interface==6.1

32
conf/requirement_bullseye.txt
View file

@ -6,8 +6,8 @@ bleach==6.1.0
canonicaljson==2.0.0 canonicaljson==2.0.0
certifi==2023.7.22 certifi==2023.7.22
cffi==1.16.0 cffi==1.16.0
charset-normalizer==3.3.1 charset-normalizer==3.3.2
constantly==15.1.0 constantly==23.10.4
cryptography==41.0.5 cryptography==41.0.5
hyperlink==21.0.0 hyperlink==21.0.0
idna==3.4 idna==3.4
@ -15,46 +15,46 @@ ijson==3.2.3
immutabledict==3.0.0 immutabledict==3.0.0
incremental==22.10.0 incremental==22.10.0
Jinja2==3.1.2 Jinja2==3.1.2
jsonschema==4.19.1 jsonschema==4.20.0
jsonschema-specifications==2023.7.1 jsonschema-specifications==2023.11.1
ldap3==2.9.1 ldap3==2.9.1
lxml==4.9.3 lxml==4.9.3
MarkupSafe==2.1.3 MarkupSafe==2.1.3
matrix-common==1.3.0 matrix-common==1.3.0
matrix-synapse==1.95.0 matrix-synapse==1.96.1
matrix-synapse-ldap3==0.3.0 matrix-synapse-ldap3==0.3.0
msgpack==1.0.7 msgpack==1.0.7
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
netaddr==0.9.0 netaddr==0.9.0
packaging==23.2 packaging==23.2
phonenumbers==8.13.23 phonenumbers==8.13.25
Pillow==10.1.0 Pillow==10.1.0
pkg_resources==0.0.0 pkg_resources==0.0.0
prometheus-client==0.17.1 prometheus-client==0.18.0
psycopg2==2.9.9 psycopg2==2.9.9
pyasn1==0.5.0 pyasn1==0.5.0
pyasn1-modules==0.3.0 pyasn1-modules==0.3.0
pycparser==2.21 pycparser==2.21
pydantic==2.4.2 pydantic==2.5.1
pydantic_core==2.10.1 pydantic_core==2.14.3
pymacaroons==0.13.0 pymacaroons==0.13.0
PyNaCl==1.5.0 PyNaCl==1.5.0
pyOpenSSL==23.2.0 pyOpenSSL==23.3.0
PyYAML==6.0.1 PyYAML==6.0.1
referencing==0.30.2 referencing==0.31.0
requests==2.31.0 requests==2.31.0
rpds-py==0.10.6 rpds-py==0.13.0
semantic-version==2.10.0 semantic-version==2.10.0
service-identity==23.1.0 service-identity==23.1.0
setuptools-rust==1.7.0 setuptools-rust==1.8.1
signedjson==1.1.4 signedjson==1.1.4
six==1.16.0 six==1.16.0
sortedcontainers==2.4.0 sortedcontainers==2.4.0
tomli==2.0.1 tomli==2.0.1
treq==22.2.0 treq==23.11.0
Twisted==23.8.0 Twisted==23.10.0
typing_extensions==4.8.0 typing_extensions==4.8.0
unpaddedbase64==2.1.0 unpaddedbase64==2.1.0
urllib3==2.0.7 urllib3==2.1.0
webencodings==0.5.1 webencodings==0.5.1
zope.interface==6.1 zope.interface==6.1

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.95.0~ynh1", "version": "1.96.1~ynh1",
"url": "http://matrix.org", "url": "http://matrix.org",
"license": "Apache-2.0", "license": "Apache-2.0",
"maintainer": { "maintainer": {

4
scripts/install
View file

@ -330,6 +330,10 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2
ynh_script_progression --message="Configuring application..." ynh_script_progression --message="Configuring application..."
ynh_add_fpm_config --usage=low --footprint=low ynh_add_fpm_config --usage=low --footprint=low
sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf
sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf
sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/$app.conf
ynh_store_file_checksum --file=$(ls /etc/php/7.*/fpm/pool.d/$app.conf)
# Create .well-known redirection for access by federation # Create .well-known redirection for access by federation
if yunohost --output-as plain domain list | grep -q "^$server_name$" if yunohost --output-as plain domain list | grep -q "^$server_name$"

4
scripts/upgrade
View file

@ -520,6 +520,10 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
ynh_script_progression --message="Configuring application..." ynh_script_progression --message="Configuring application..."
ynh_add_fpm_config --usage=low --footprint=low ynh_add_fpm_config --usage=low --footprint=low
sed -i "s|user\s*=\s*$app|user = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf
sed -i "s|group\s*=\s*$app|group = matrix-$app|g" /etc/php/7.*/fpm/pool.d/$app.conf
sed -i "s|chdir\s*=\s*/opt/yunohost/matrix-synapse.*|chdir = $final_www_path|g" /etc/php/7.*/fpm/pool.d/$app.conf
ynh_store_file_checksum --file=$(ls /etc/php/7.*/fpm/pool.d/$app.conf)
# Create .well-known redirection for access by federation # Create .well-known redirection for access by federation
if yunohost --output-as plain domain list | grep -q "^$server_name$" if yunohost --output-as plain domain list | grep -q "^$server_name$"