mirror of
https://github.com/YunoHost-Apps/synapse_ynh.git
synced 2024-09-03 20:26:38 +02:00
Merge branch 'master' into config-panel
This commit is contained in:
commit
af225f6201
4 changed files with 22 additions and 4 deletions
|
@ -53,7 +53,7 @@ install_sources() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
chown $synapse_user:root -R $final_path
|
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
|
pip3 install --upgrade cffi ndg-httpsclient psycopg2 lxml jinja2
|
||||||
# Fix issue https://github.com/YunoHost-Apps/synapse_ynh/issues/248
|
# 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
|
pip3 install --upgrade 'Twisted>=21' 'treq>=21.1.0' matrix-synapse==$upstream_version matrix-synapse-ldap3
|
||||||
|
|
|
@ -219,7 +219,13 @@ ynh_exec_warn_less ynh_install_app_dependencies $dependances
|
||||||
ynh_script_progression --message="Configuring system user..." --weight=3
|
ynh_script_progression --message="Configuring system user..." --weight=3
|
||||||
|
|
||||||
ynh_system_user_create --username=$synapse_user --home_dir=$final_path
|
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 $synapse_user ssl-cert
|
||||||
adduser turnserver ssl-cert
|
adduser turnserver ssl-cert
|
||||||
|
|
||||||
|
|
|
@ -80,7 +80,13 @@ ynh_script_progression --message="Recreating the dedicated system user..." --wei
|
||||||
|
|
||||||
# Create the dedicated user (if not existing)
|
# Create the dedicated user (if not existing)
|
||||||
ynh_system_user_create --username=$synapse_user --home_dir=$final_path
|
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 $synapse_user ssl-cert
|
||||||
adduser turnserver ssl-cert
|
adduser turnserver ssl-cert
|
||||||
|
|
||||||
|
|
|
@ -186,7 +186,13 @@ fi
|
||||||
if [ -z $synapse_user_app_pwd ]; then
|
if [ -z $synapse_user_app_pwd ]; then
|
||||||
synapse_user_app_pwd="$(ynh_string_random --length=30)"
|
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
|
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
|
fi
|
||||||
|
|
||||||
#=================================================
|
#=================================================
|
||||||
|
|
Loading…
Reference in a new issue