diff --git a/README.md b/README.md index d348d84..07e59b0 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:** 20211221~ynh1 +**Shipped version:** 20220222~ynh1 **Demo:** https://demo.yunohost.org/ttrss/ @@ -39,7 +39,8 @@ Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader an ### Default login credentials -Username: `admin`, password: `password` +- Username: `admin` +- password: `password` ## Documentation and resources * Official app website: http://tt-rss.org diff --git a/README_fr.md b/README_fr.md index 1370731..8ea7e75 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 :** 20211221~ynh1 +**Version incluse :** 20220222~ynh1 **Démo :** https://demo.yunohost.org/ttrss/ @@ -26,7 +26,9 @@ Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ### Default login credentials -Username: `admin`, password: `password` +- Username: `admin` +- password: `password` + ## Documentations et ressources * Site officiel de l'app : http://tt-rss.org diff --git a/conf/app.src b/conf/app.src index f70d0ab..7823339 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.tt-rss.org/fox/tt-rss/archive/9a5c21630b5b7e2e3adb2e0334defbd9515aa833.tar.gz +SOURCE_SUM=12e0930daa54d2fad3ce39c934c455de3b75adde33e406420e40650e755438bf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.php b/conf/config.php index f25764b..286f586 100644 --- a/conf/config.php +++ b/conf/config.php @@ -6,7 +6,7 @@ putenv('TTRSS_DB_TYPE=mysql'); // 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=3306'); // usually 5432 for PostgreSQL, 3306 for MySQL @@ -118,7 +118,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/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index c166933..8efb3b1 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,3 +1,4 @@ ### Default login credentials -Username: `admin`, password: `password` \ No newline at end of file +- Username: `admin` +- password: `password` \ No newline at end of file diff --git a/manifest.json b/manifest.json index fc90011..573a40c 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": "20211221~ynh1", + "version": "20220222~ynh1", "url": "http://tt-rss.org", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/change_url b/scripts/change_url index d3e030f..8412736 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --weight=1 final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= @@ -99,8 +100,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"