diff --git a/manifest.toml b/manifest.toml index 9d1ac47..5abe36b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ userdoc = "https://github.com/go-shiori/shiori/wiki/Usage" code = "https://github.com/go-shiori/shiori" [integration] -yunohost = ">= 11.0.9" +yunohost = ">= 11.1.8" architectures = "all" multi_instance = true ldap = "not_relevant" @@ -48,3 +48,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" + + [resources.apt] + packages = "sqlite3" diff --git a/scripts/install b/scripts/install index 91f223c..ff59092 100755 --- a/scripts/install +++ b/scripts/install @@ -17,6 +17,11 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +chmod +x "$install_dir/shiori" + #================================================= # NGINX CONFIGURATION #================================================= @@ -63,15 +68,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions to app files -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chmod +x "$install_dir/shiori" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 8e4ecdd..1bda66d 100755 --- a/scripts/restore +++ b/scripts/restore @@ -26,6 +26,11 @@ 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 +x "$install_dir/shiori" + #================================================= # RESTORE THE DATA DIRECTORY #================================================= @@ -68,15 +73,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions to app files -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chmod +x "$install_dir/shiori" - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 62044d5..8487e7d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,6 +36,11 @@ then ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH fi +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +chmod +x "$install_dir/shiori" + #================================================= # NGINX CONFIGURATION #================================================= @@ -76,15 +81,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions to app files -chmod -R o-rwx "$install_dir" -chown -R $app:www-data "$install_dir" -chmod +x "$install_dir/shiori" - #================================================= # END OF SCRIPT #=================================================