diff --git a/README.md b/README.md index 8e4abb6..f2f50fa 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:** 20211228~ynh1 +**Shipped version:** 20220414~ynh1 **Demo:** https://demo.yunohost.org/ttrss/ @@ -35,11 +35,17 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an ![](./doc/screenshots/screenshot.png) +## Disclaimers / important information + +### Default login credentials + +- Username: `admin` +- password: `password` ## Documentation and resources * Official app website: http://tt-rss.org * Official admin documentation: https://git.tt-rss.org/git/tt-rss/wiki -* Upstream app code repository: https://git.tt-rss.org/git/tt-rss +* Upstream app code repository: https://git-gitea.tt-rss.org/fox/tt-rss * YunoHost documentation for this app: https://yunohost.org/app_ttrss * Report a bug: https://github.com/YunoHost-Apps/ttrss_ynh/issues diff --git a/README_fr.md b/README_fr.md index 533dcd4..18d1153 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 :** 20211228~ynh1 +**Version incluse :** 20220414~ynh1 **Démo :** https://demo.yunohost.org/ttrss/ @@ -22,11 +22,17 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ![](./doc/screenshots/screenshot.png) +## Avertissements / informations importantes + +### Default login credentials + +- Username: `admin` +- password: `password` ## Documentations et ressources * Site officiel de l'app : http://tt-rss.org * Documentation officielle de l'admin : https://git.tt-rss.org/git/tt-rss/wiki -* Dépôt de code officiel de l'app : https://git.tt-rss.org/git/tt-rss +* Dépôt de code officiel de l'app : https://git-gitea.tt-rss.org/fox/tt-rss * Documentation YunoHost pour cette app : https://yunohost.org/app_ttrss * Signaler un bug : https://github.com/YunoHost-Apps/ttrss_ynh/issues diff --git a/check_process b/check_process index 7b34872..e6be363 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/app.src b/conf/app.src index f70d0ab..804f5cf 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/97baf3e8b9be699d972b91a159ccbe0891efe8ae.tar.gz -SOURCE_SUM=5810abdde57daa282f470c0bb4c631596f6b6487a41ef8f27b10f0d2ad6407b0 +SOURCE_URL=https://git-gitea.tt-rss.org/fox/tt-rss/archive/2654b3c6be408113ede52180ae283afa72da5f3c.tar.gz +SOURCE_SUM=2e266d66f182d213509ec079454522b23f23da3e411de4b1f037793e97284db8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.php b/conf/config.php index c16bdb3..2be3c1d 100644 --- a/conf/config.php +++ b/conf/config.php @@ -6,7 +6,7 @@ putenv('TTRSS_DB_TYPE=pgsql'); // or mysql putenv('TTRSS_DB_HOST=localhost'); - putenv('TTRSS_DB_USER=__DB_NAME__'); + putenv('TTRSS_DB_USER=__DB_USER__'); putenv('TTRSS_DB_NAME=__DB_NAME__'); putenv('TTRSS_DB_PASS=__DB_PWD__'); putenv('TTRSS_DB_PORT=5432'); // usually 5432 for PostgreSQL, 3306 for MySQL @@ -114,7 +114,7 @@ // and potentially might lead to data loss or server exploit. Disabled // by default. - putenv('TTRSS_REG_NOTIFY_ADDRESS=user@your.domain.dom'); + putenv('TTRSS_REG_NOTIFY_ADDRESS=user@__DOMAIN__'); // Email address to send new user notifications to. putenv('TTRSS_REG_MAX_USERS=10'); 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/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..8efb3b1 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,4 @@ +### Default login credentials + +- Username: `admin` +- password: `password` \ No newline at end of file diff --git a/manifest.json b/manifest.json index 969869e..4d71173 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,14 @@ "en": "News feed (RSS/Atom) reader and aggregator", "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom" }, - "version": "20211228~ynh1", + "version": "20220414~ynh1", "url": "http://tt-rss.org", "upstream": { "license": "GPL-3.0-only", "website": "http://tt-rss.org", "demo": "https://demo.yunohost.org/ttrss/", "admindoc": "https://git.tt-rss.org/git/tt-rss/wiki", - "code": "https://git.tt-rss.org/git/tt-rss" + "code": "https://git-gitea.tt-rss.org/fox/tt-rss" }, "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/backup b/scripts/backup index 73330d9..bb8a185 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 POSTGRESQL DATABASE #================================================= diff --git a/scripts/change_url b/scripts/change_url index 60a66ca..bd669e4 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -99,8 +99,8 @@ fi #================================================= ynh_script_progression --message="Configuring $app..." --weight=1 -domain_path=https://$new_domain$new_path - +domain_path="https://${new_domain}${new_path}" +domain="$new_domain" ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php" chmod 400 "$final_path/config.php" diff --git a/scripts/install b/scripts/install index 6d885aa..8b447d8 100644 --- a/scripts/install +++ b/scripts/install @@ -151,15 +151,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 #================================================= @@ -170,6 +161,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 e278da8..047469f 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,13 +100,6 @@ ynh_script_progression --message="Restoring various files..." --weight=1 ynh_restore_file --origin_path="/etc/cron.d/$app" -#================================================= -# 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 7b051a1..5a36127 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"