Merge pull request #428 from YunoHost-Apps/fix_sso_update

Fix sso update

README.md

@@ -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)
 
 
-**Shipped version:** 1.95.0~ynh1
+**Shipped version:** 1.96.1~ynh1
 ## Disclaimers / important information
 
 ## 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/>
 * 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>
 
 ## Developer info

README_fr.md

@@ -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)
 
 
-**Version incluse :** 1.95.0~ynh1
+**Version incluse :** 1.96.1~ynh1
 ## Avertissements / informations importantes
 
 ## 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/>
 * 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>
 
 ## Informations pour les développeurs

conf/armv7_bookworm.src

@@ -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_SUM=1a1d9248b139f67d23a89a20745d14d88c5b8627f76872d7f94f66952b5f1253
+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=4c084d839a3aa058f950c5abda85554b1635b8effcd77bd7a471a21f0a22a9a2
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum

conf/armv7_bullseye.src

@@ -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_SUM=97e9942bea9bcecc2a75228255a1824298300302559a9332e50816fa54193738
+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=09fe388a344ecb71acb63c15ea4451ddcc5df6fbef1644f030e49ec35c311068
 # (Optional) Program to check the integrity (sha256sum, md5sum...)
 # default: sha256
 SOURCE_SUM_PRG=sha256sum

conf/nginx.conf

@@ -10,7 +10,7 @@ location __PATH__/ {
         location __PATH__/cas_server.php {
             alias /var/www/__APP__/;
             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;
             fastcgi_param REMOTE_USER $remote_user;
             fastcgi_param PATH_INFO $fastcgi_path_info;

conf/requirement_bookworm.txt

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

conf/requirement_bullseye.txt

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

manifest.json

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

scripts/install

@@ -330,6 +330,10 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2
 ynh_script_progression --message="Configuring application..."
 
 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
 if yunohost --output-as plain domain list | grep -q "^$server_name$"

scripts/upgrade

@@ -520,6 +520,10 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 ynh_script_progression --message="Configuring application..."
 
 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
 if yunohost --output-as plain domain list | grep -q "^$server_name$"