diff --git a/scripts/_common.sh b/scripts/_common.sh index d3ca72f..b754169 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -53,7 +53,7 @@ install_sources() { fi chown $synapse_user:root -R $final_path - sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade 'cryptography>=3.4.7' + sudo -u $synapse_user env PATH=$PATH pip3 install --upgrade 'cryptography>=3.4.7' 'pyOpenSSL>=22.1.0' 'attrs>=22.1.0' pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2 # Fix issue https://github.com/YunoHost-Apps/synapse_ynh/issues/248 pip3 install --upgrade 'Twisted>=21' 'treq>=21.1.0' matrix-synapse==$upstream_version matrix-synapse-ldap3 diff --git a/scripts/install b/scripts/install index f620003..9a7b3a1 100644 --- a/scripts/install +++ b/scripts/install @@ -146,7 +146,13 @@ ynh_exec_warn_less ynh_install_app_dependencies $dependances ynh_script_progression --message="Configuring system user..." --weight=3 ynh_system_user_create --username=$synapse_user --home_dir=$final_path -yunohost user create $synapse_user_app -f Synapse -l Application -d $domain -p "$synapse_user_app_pwd" +# The format to create an user account varies depending on the version of YunoHost currently installed. +ynh_current_version=$(dpkg-query --showformat='${Version}' --show yunohost) +if $(dpkg --compare-versions "$ynh_current_version" ge "11.1"); then + yunohost user create $synapse_user_app -F "Synapse Application" -d $domain -p "$synapse_user_app_pwd" +else + yunohost user create $synapse_user_app -f Synapse -l Application -d $domain -p "$synapse_user_app_pwd" +fi adduser $synapse_user ssl-cert adduser turnserver ssl-cert diff --git a/scripts/restore b/scripts/restore index a393098..8f424f8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,7 +80,13 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei # Create the dedicated user (if not existing) ynh_system_user_create --username=$synapse_user --home_dir=$final_path -yunohost user create $synapse_user_app -f Synapse -l Application -d $domain -p "$synapse_user_app_pwd" +# The format to create an user account varies depending on the version of YunoHost currently installed. +ynh_current_version=$(dpkg-query --showformat='${Version}' --show yunohost) +if $(dpkg --compare-versions "$ynh_current_version" ge "11.1"); then + yunohost user create $synapse_user_app -F "Synapse Application" -d $domain -p "$synapse_user_app_pwd" +else + yunohost user create $synapse_user_app -f Synapse -l Application -d $domain -p "$synapse_user_app_pwd" +fi adduser $synapse_user ssl-cert adduser turnserver ssl-cert diff --git a/scripts/upgrade b/scripts/upgrade index e108011..d530f6b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -141,7 +141,13 @@ fi if [ -z $synapse_user_app_pwd ]; then synapse_user_app_pwd="$(ynh_string_random --length=30)" ynh_app_setting_set --app=$app --key=synapse_user_app_pwd --value=$synapse_user_app_pwd - yunohost user create $synapse_user_app -f Synapse -l Application -d $domain -p "$synapse_user_app_pwd" + # The format to create an user account varies depending on the version of YunoHost currently installed. + ynh_current_version=$(dpkg-query --showformat='${Version}' --show yunohost) + if $(dpkg --compare-versions "$ynh_current_version" ge "11.1"); then + yunohost user create $synapse_user_app -F "Synapse Application" -d $domain -p "$synapse_user_app_pwd" + else + yunohost user create $synapse_user_app -f Synapse -l Application -d $domain -p "$synapse_user_app_pwd" + fi fi #=================================================