diff --git a/manifest.toml b/manifest.toml index 1ef0043..5b58a04 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Tiny Tiny RSS" description.en = "News feed (RSS/Atom) reader and aggregator" description.fr = "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" -version = "20240831~ynh1" +version = "20240831~ynh2" maintainers = [] @@ -17,7 +17,7 @@ admindoc = "https://tt-rss.org/wiki.php" code = "https://gitlab.tt-rss.org/tt-rss/tt-rss" [integration] -yunohost = ">= 11.2.29" +yunohost = ">= 11.2.30" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/backup b/scripts/backup index 1341228..3dd4c55 100644 --- a/scripts/backup +++ b/scripts/backup @@ -12,7 +12,7 @@ ynh_print_info "Declaring files to be backed up..." ynh_backup "$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/change_url b/scripts/change_url index 3ec62ee..0cba764 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -17,8 +17,6 @@ ynh_script_progression "Updating NGINX web server configuration..." ynh_config_change_url_nginx -#================================================= -# SPECIFIC MODIFICATIONS #================================================= # UPDATE A CONFIG FILE #================================================= diff --git a/scripts/install b/scripts/install index 7fcf8cf..18d0db4 100644 --- a/scripts/install +++ b/scripts/install @@ -11,6 +11,7 @@ ynh_app_setting_set --key=php_upload_max_filesize --value=10M ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" + echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" #================================================= @@ -18,19 +19,14 @@ echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="News feed reader and aggregator" --log="/var/log/$app/$app.log" -#================================================= -# SPECIFIC SETUP #================================================= # ADD A CONFIGURATION #================================================= @@ -43,8 +39,7 @@ ynh_config_add --template="config.php" --destination="$install_dir/config.php" #================================================= ynh_script_progression "Initializing database..." -ynh_psql_db_shell \ - < "$install_dir/schema/ttrss_schema_pgsql.sql" +ynh_psql_db_shell < "$install_dir/schema/ttrss_schema_pgsql.sql" ynh_exec_as_app php$php_version $install_dir/update.php --update-schema=force-yes @@ -53,7 +48,6 @@ ynh_exec_as_app php$php_version $install_dir/update.php --update-schema=force-ye #================================================= ynh_script_progression "Starting $app's systemd service..." -# Start a systemd service ynh_systemctl --service=$app --action="start" --log_path="systemd" #================================================= diff --git a/scripts/remove b/scripts/remove index 8960c7f..70f5dfd 100644 --- a/scripts/remove +++ b/scripts/remove @@ -5,9 +5,6 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SYSTEM CONFIGURATIONS -#================================================= -# REMOVE SYSTEMD SERVICE - #================================================= ynh_script_progression "Removing system configurations related to $app..." diff --git a/scripts/restore b/scripts/restore index 2c5f475..63f89b3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,8 @@ yunohost service add $app --description="News feed reader and aggregator" --log= ynh_script_progression "Starting $app's systemd service..." ynh_systemctl --service=$app --action="start" --log_path="systemd" - ynh_systemctl --service=php$php_version-fpm --action=reload + ynh_systemctl --service=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ea806b4..5297295 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,7 @@ ynh_safe_rm "/etc/cron.d/$app" ynh_script_progression "Upgrading source files..." ynh_setup_source --dest_dir="$install_dir" + echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt" #=================================================