Merge remote-tracking branch 'origin/testing' into v2

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.100.0~ynh1
 ## Disclaimers / important information
 
 ## Configuration

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.100.0~ynh1
 ## Avertissements / informations importantes
 
 ## Configuration

conf/requirement_bookworm.txt

@@ -1,58 +1,58 @@
 annotated-types==0.6.0
-attrs==23.1.0
+attrs==23.2.0
 Automat==22.10.0
-bcrypt==4.0.1
+bcrypt==4.1.2
 bleach==6.1.0
 canonicaljson==2.0.0
-certifi==2023.7.22
+certifi==2023.11.17
 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==42.0.2
 hyperlink==21.0.0
-idna==3.4
+idna==3.6
 ijson==3.2.3
-immutabledict==3.0.0
+immutabledict==4.1.0
 incremental==22.10.0
-Jinja2==3.1.2
+Jinja2==3.1.3
-jsonschema==4.19.1
+jsonschema==4.21.1
-jsonschema-specifications==2023.7.1
+jsonschema-specifications==2023.12.1
 ldap3==2.9.1
-lxml==4.9.3
+lxml==5.1.0
-MarkupSafe==2.1.3
+MarkupSafe==2.1.4
 matrix-common==1.3.0
-matrix-synapse==1.95.0
+matrix-synapse==1.100.0
 matrix-synapse-ldap3==0.3.0
 msgpack==1.0.7
 ndg-httpsclient==0.5.1
-netaddr==0.9.0
+netaddr==0.10.1
 packaging==23.2
-phonenumbers==8.13.23
+phonenumbers==8.13.29
-Pillow==10.1.0
+pillow==10.2.0
-prometheus-client==0.17.1
+prometheus-client==0.19.0
 psycopg2==2.9.9
-pyasn1==0.5.0
+pyasn1==0.5.1
 pyasn1-modules==0.3.0
 pycparser==2.21
-pydantic==2.4.2
+pydantic==2.6.0
-pydantic_core==2.10.1
+pydantic_core==2.16.1
 pymacaroons==0.13.0
 PyNaCl==1.5.0
-pyOpenSSL==23.2.0
+pyOpenSSL==24.0.0
 PyYAML==6.0.1
-referencing==0.30.2
+referencing==0.33.0
 requests==2.31.0
-rpds-py==0.10.6
+rpds-py==0.17.1
 semantic-version==2.10.0
-service-identity==23.1.0
+service-identity==24.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
+treq==23.11.0
-Twisted==23.8.0
+Twisted==23.10.0
-typing_extensions==4.8.0
+typing_extensions==4.9.0
 unpaddedbase64==2.1.0
-urllib3==2.0.7
+urllib3==2.2.0
 webencodings==0.5.1
 zope.interface==6.1

conf/requirement_bullseye.txt

@@ -1,60 +1,60 @@
 annotated-types==0.6.0
-attrs==23.1.0
+attrs==23.2.0
 Automat==22.10.0
-bcrypt==4.0.1
+bcrypt==4.1.2
 bleach==6.1.0
 canonicaljson==2.0.0
-certifi==2023.7.22
+certifi==2023.11.17
 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==42.0.2
 hyperlink==21.0.0
-idna==3.4
+idna==3.6
 ijson==3.2.3
-immutabledict==3.0.0
+immutabledict==4.1.0
 incremental==22.10.0
-Jinja2==3.1.2
+Jinja2==3.1.3
-jsonschema==4.19.1
+jsonschema==4.21.1
-jsonschema-specifications==2023.7.1
+jsonschema-specifications==2023.12.1
 ldap3==2.9.1
-lxml==4.9.3
+lxml==5.1.0
-MarkupSafe==2.1.3
+MarkupSafe==2.1.4
 matrix-common==1.3.0
-matrix-synapse==1.95.0
+matrix-synapse==1.100.0
 matrix-synapse-ldap3==0.3.0
 msgpack==1.0.7
 ndg-httpsclient==0.5.1
-netaddr==0.9.0
+netaddr==0.10.1
 packaging==23.2
-phonenumbers==8.13.23
+phonenumbers==8.13.29
-Pillow==10.1.0
+pillow==10.2.0
 pkg_resources==0.0.0
-prometheus-client==0.17.1
+prometheus-client==0.19.0
 psycopg2==2.9.9
-pyasn1==0.5.0
+pyasn1==0.5.1
 pyasn1-modules==0.3.0
 pycparser==2.21
-pydantic==2.4.2
+pydantic==2.6.0
-pydantic_core==2.10.1
+pydantic_core==2.16.1
 pymacaroons==0.13.0
 PyNaCl==1.5.0
-pyOpenSSL==23.2.0
+pyOpenSSL==24.0.0
 PyYAML==6.0.1
-referencing==0.30.2
+referencing==0.33.0
 requests==2.31.0
-rpds-py==0.10.6
+rpds-py==0.17.1
 semantic-version==2.10.0
-service-identity==23.1.0
+service-identity==24.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
+treq==23.11.0
-Twisted==23.8.0
+Twisted==23.10.0
-typing_extensions==4.8.0
+typing_extensions==4.9.0
 unpaddedbase64==2.1.0
-urllib3==2.0.7
+urllib3==2.2.0
 webencodings==0.5.1
 zope.interface==6.1

scripts/install

@@ -211,6 +211,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)
 
 configure_nginx
 

scripts/upgrade

@@ -390,6 +390,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)
 
 configure_nginx