diff --git a/manifest.toml b/manifest.toml index 13c5260..0c61df6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -14,7 +14,7 @@ license = "Apache-2.0" code = "https://github.com/Awesome-Technologies/synapse-admin" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = false ldap = false diff --git a/scripts/install b/scripts/install index 6b37d13..e670487 100644 --- a/scripts/install +++ b/scripts/install @@ -27,7 +27,6 @@ ynh_script_progression --message="Setting up source files..." --weight=2 # 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 e2e5e78..de3a7ef 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,26 +9,24 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -ynh_restore_file --origin_path="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring the app main directory..." --weight=60 +ynh_script_progression --message="Restoring the app main directory..." --weight=10 ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +ynh_restore_file --origin_path="/etc/nginx/conf.d/${synapse_domain}.d/$app.endpoint.conf" + #================================================= # GENERIC FINALIZATION #=================================================