diff --git a/README.md b/README.md index 07e59b0..53579e8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an - podcasts, - flexible article filtering -**Shipped version:** 20220222~ynh1 +**Shipped version:** 20220222~ynh2 **Demo:** https://demo.yunohost.org/ttrss/ diff --git a/README_fr.md b/README_fr.md index 0e5219b..b5aaeec 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ligne gratuit et open source. -**Version incluse :** 20220222~ynh1 +**Version incluse :** 20220222~ynh2 **Démo :** https://demo.yunohost.org/ttrss/ diff --git a/check_process b/check_process index 7b34872..53fdb26 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=be16ff54ae531329590ef6576d6f928315ebe0cf + upgrade=1 from_commit=20435c4d005d7abffc45db4eac3d3e9492302c21 backup_restore=1 multi_instance=1 change_url=1 @@ -19,7 +19,7 @@ Email= Notification=none ;;; Upgrade options - ; commit=be16ff54ae531329590ef6576d6f928315ebe0cf - name=Create cron + ; commit=20435c4d005d7abffc45db4eac3d3e9492302c21 + name=Testing (#105) manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/conf/cron b/conf/cron deleted file mode 100644 index 84bed3f..0000000 --- a/conf/cron +++ /dev/null @@ -1 +0,0 @@ -*/30 * * * * /usr/bin/php__PHPVERSION__ __FINALPATH__/update.php --feeds --quiet \ No newline at end of file diff --git a/manifest.json b/manifest.json index 573a40c..ef3b53c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "News feed (RSS/Atom) reader and aggregator", "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" }, - "version": "20220222~ynh1", + "version": "20220222~ynh2", "url": "http://tt-rss.org", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/backup b/scripts/backup index 719bc83..edae2c2 100644 --- a/scripts/backup +++ b/scripts/backup @@ -58,12 +58,6 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_backup --src_path="/etc/systemd/system/$app.service" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - -ynh_backup --src_path="/etc/cron.d/$app" - #================================================= # BACKUP THE MYSQL DATABASE #================================================= diff --git a/scripts/install b/scripts/install index 67e99d7..89992ef 100644 --- a/scripts/install +++ b/scripts/install @@ -153,15 +153,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" -#================================================= -# SETUP A CRON -#================================================= -ynh_script_progression --message="Setuping a cron..." --weight=1 - -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" -chown root: "/etc/cron.d/$app" -chmod 644 "/etc/cron.d/$app" - #================================================= # SETUP SSOWAT #================================================= @@ -172,6 +163,8 @@ then ynh_permission_update --permission="main" --add="visitors" fi +ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" + #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/restore b/scripts/restore index c009a3b..7a5b057 100644 --- a/scripts/restore +++ b/scripts/restore @@ -92,13 +92,6 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -#================================================= -# RESTORE VARIOUS FILES -#================================================= -ynh_script_progression --message="Restoring various files..." --weight=1 - -ynh_restore_file --origin_path="/etc/cron.d/$app" - #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 93efc0c..3f1c075 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,6 +77,11 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi +# Create a permission if needed +if ! ynh_permission_exists --permission="api"; then + ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" +fi + # Do not remove the file before the backup, to not fail the backup. # Remove old cron job ynh_secure_remove --file="/etc/cron.d/$app"