diff --git a/manifest.toml b/manifest.toml index cc513ae..6a0bf93 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,13 +16,11 @@ demo = "https://hydrogen.element.io/" code = "https://github.com/vector-im/hydrogen-web" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.27" helpers_version = "2.1" architectures = "all" multi_instance = true - ldap = false - sso = false disk = "50M" diff --git a/scripts/install b/scripts/install index a256060..4338706 100755 --- a/scripts/install +++ b/scripts/install @@ -17,14 +17,11 @@ ynh_script_progression "Setting up source files..." # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION #================================================= ynh_script_progression "Configuring NGINX web server..." -# Create a dedicated NGINX config ynh_config_add_nginx #================================================= @@ -34,9 +31,6 @@ ynh_script_progression "Adding $app's configuration..." ynh_config_add --template="config.sample.json" --destination="$install_dir/config.json" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 660 "$install_dir/config.json" -#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app:www-data "$install_dir/config.json" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 958d9d3..7d7319b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -11,8 +11,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5559082..74e449a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,13 +3,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# STOP SYSTEMD SERVICE -#================================================= -ynh_script_progression "Stopping $app's systemd service..." - -ynh_systemctl --service=$app --action="stop" - #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= @@ -24,18 +17,11 @@ fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression "Upgrading source files..." -# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed -if ynh_app_upstream_version_changed -then - ynh_script_progression "Upgrading source files..." +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --full_replace - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace -fi - -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # NGINX CONFIGURATION #=================================================