diff --git a/conf/app.src b/conf/app.src index 0eb1f74..4b88ac1 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.23/element-v1.11.23.tar.gz -SOURCE_SUM=d8b6e81531e975e9f581fd582f679b1052b432336fd5e4ffb702502e71d0a24d +SOURCE_URL=https://github.com/vector-im/element-web/releases/download/v1.11.24/element-v1.11.24.tar.gz +SOURCE_SUM=2671281dde4c577e20c3c1bce24caa519a574b848e63f968d0f76a43455936c1 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.toml b/manifest.toml index 15e2b44..ed424cf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Element" description.en = "Web client for Matrix" description.fr = "Client web pour Matrix" -version = "1.11.23~ynh1" +version = "1.11.24~ynh1" maintainers = ["Josué Tille"] @@ -18,7 +18,7 @@ code = "https://github.com/vector-im/element-web/" cpe = "cpe:2.3:a:matrix:element" [integration] -yunohost = ">= 11.1.7" +yunohost = ">= 11.1.12" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/change_url b/scripts/change_url index 8222f09..ab2d658 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -6,87 +6,14 @@ # IMPORT GENERIC HELPERS #================================================= -source _common.sh source /usr/share/yunohost/helpers -#================================================= -# RETRIEVE ARGUMENTS -#================================================= - -old_domain=$YNH_APP_OLD_DOMAIN -old_path=$YNH_APP_OLD_PATH - -new_domain=$YNH_APP_NEW_DOMAIN -new_path=$YNH_APP_NEW_PATH - -#================================================= -# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. - ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - - # Restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - -#================================================= -# CHECK WHICH PARTS SHOULD BE CHANGED -#================================================= - -change_domain=0 -if [ "$old_domain" != "$new_domain" ] -then - change_domain=1 -fi - -change_path=0 -if [ "$old_path" != "$new_path" ] -then - change_path=1 -fi - #================================================= # MODIFY URL IN NGINX CONF #================================================= ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 -nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf - -# Change the path in the NGINX config file -if [ $change_path -eq 1 ] -then - # Make a backup of the original NGINX config file if modified - ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for NGINX helper - domain="$old_domain" - path_url="$new_path" - # Create a dedicated NGINX config - ynh_add_nginx_config -fi - -# Change the domain for NGINX -if [ $change_domain -eq 1 ] -then - # Delete file checksum for the old conf file location - ynh_delete_file_checksum --file="$nginx_conf_path" - mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf - # Store file checksum for the new config file location - ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" -fi - -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - -ynh_systemd_action --service_name=nginx --action=reload +ynh_change_url_nginx_config #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 0323aca..c15fbc4 100644 --- a/scripts/install +++ b/scripts/install @@ -13,7 +13,7 @@ source /usr/share/yunohost/helpers # RETRIEVE ARGUMENTS FROM THE MANIFEST #================================================= -default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER +#default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER login_for_welcome=true #================================================= @@ -21,7 +21,7 @@ login_for_welcome=true #================================================= ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome -ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server +#ynh_app_setting_set --app=$app --key=default_home_server --value=$default_home_server #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -31,8 +31,6 @@ ynh_script_progression --message="Setting up source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= diff --git a/scripts/restore b/scripts/restore index 458d845..cf6f4b0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -17,22 +17,23 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" chmod 400 "$install_dir/config.json" chown $app:$app "$install_dir/config.json" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=2 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= -# RESTORE SYSTEM CONFIGURATIONS +# GENERIC FINALIZATION #================================================= -ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 +# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE +#================================================= +ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 7290c12..26bc2c0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,8 +43,6 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="config.json" fi -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #=================================================