YunoHost-Apps/freshrss_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/freshrss_ynh.git synced 2024-09-03 18:36:33 +02:00
Code Issues Activity Actions

Fix change_url : $domain or $path may be unbound... (#131)

Browse source 
* Fix change_url : $domain or $path may be unbound...

* Update manifest.json

* Auto-update README

* Update restore

Co-authored-by: ericgaspar <junk.eg@free.fr>
Co-authored-by: Yunohost-Bot <>
This commit is contained in:
Alexandre Aubin 2021-11-13 16:55:53 +01:00 committed by GitHub
parent 20d0dfad5d
commit 92a0792043
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
RSS aggregator with a nice and mobile-friendly design RSS aggregator with a nice and mobile-friendly design
**Shipped version:** 1.18.1~ynh3 **Shipped version:** 1.18.1~ynh4
**Demo:** https://demo.freshrss.org **Demo:** https://demo.freshrss.org
@ -38,7 +38,6 @@ API (mini) How To:
## Documentation and resources ## Documentation and resources
* Official app website: http://freshrss.org/ * Official app website: http://freshrss.org/
* Official user documentation: https://yunohost.org/apps
* Official admin documentation: https://freshrss.github.io/FreshRSS/ * Official admin documentation: https://freshrss.github.io/FreshRSS/
* Upstream app code repository: https://github.com/FreshRSS/FreshRSS * Upstream app code repository: https://github.com/FreshRSS/FreshRSS
* YunoHost documentation for this app: https://yunohost.org/app_freshrss * YunoHost documentation for this app: https://yunohost.org/app_freshrss

3
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Agrégateur de flux RSS avec une interface adaptée au mobile Agrégateur de flux RSS avec une interface adaptée au mobile
**Version incluse :** 1.18.1~ynh3 **Version incluse :** 1.18.1~ynh4
**Démo :** https://demo.freshrss.org **Démo :** https://demo.freshrss.org
@ -34,7 +34,6 @@ API (mini) How To:
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : http://freshrss.org/ * Site officiel de l'app : http://freshrss.org/
* Documentation officielle utilisateur : https://yunohost.org/apps
* Documentation officielle de l'admin : https://freshrss.github.io/FreshRSS/ * Documentation officielle de l'admin : https://freshrss.github.io/FreshRSS/
* Dépôt de code officiel de l'app : https://github.com/FreshRSS/FreshRSS * Dépôt de code officiel de l'app : https://github.com/FreshRSS/FreshRSS
* Documentation YunoHost pour cette app : https://yunohost.org/app_freshrss * Documentation YunoHost pour cette app : https://yunohost.org/app_freshrss

9
manifest.json
View file

@ -6,14 +6,13 @@
"en": "RSS aggregator with a nice and mobile-friendly design", "en": "RSS aggregator with a nice and mobile-friendly design",
"fr": "Agrégateur de flux RSS avec une interface adaptée au mobile" "fr": "Agrégateur de flux RSS avec une interface adaptée au mobile"
}, },
"version": "1.18.1~ynh3", "version": "1.18.1~ynh4",
"url": "http://freshrss.org/", "url": "http://freshrss.org/",
"upstream": { "upstream": {
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"website": "http://freshrss.org/", "website": "http://freshrss.org/",
"demo": "https://demo.freshrss.org", "demo": "https://demo.freshrss.org",
"admindoc": "https://freshrss.github.io/FreshRSS/", "admindoc": "https://freshrss.github.io/FreshRSS/",
"userdoc": "https://yunohost.org/apps",
"code": "https://github.com/FreshRSS/FreshRSS" "code": "https://github.com/FreshRSS/FreshRSS"
}, },
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
@ -34,8 +33,7 @@
"install": [ "install": [
{ {
"name": "domain", "name": "domain",
"type": "domain", "type": "domain"
"example": "domain.org"
}, },
{ {
"name": "path", "name": "path",
@ -46,8 +44,7 @@
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user",
"optional": false, "optional": false
"example": "homer"
}, },
{ {
"name": "is_public", "name": "is_public",

2
scripts/change_url
View file

@ -128,7 +128,7 @@ fi
# SPECIFIC MODIFICATIONS # SPECIFIC MODIFICATIONS
#================================================= #=================================================
ynh_exec_as $app $final_path/cli/reconfigure.php --auth_type http_auth --environment production --base_url https://$domain$path_url --title FreshRSS --api_enabled --db-type mysql --db-host localhost --db-user $db_name --db-password $db_pwd --db-base $db_name ynh_exec_as $app $final_path/cli/reconfigure.php --auth_type http_auth --environment production --base_url https://$new_domain$new_path --title FreshRSS --api_enabled --db-type mysql --db-host localhost --db-user $db_name --db-password $db_pwd --db-base $db_name
#================================================= #=================================================
# GENERIC FINALIZATION # GENERIC FINALIZATION

2
scripts/restore
View file

@ -35,8 +35,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." ynh_script_progression --message="Validating restoration parameters..."
ynh_webpath_available --domain=$domain --path_url=$path_url \
|| ynh_die --message="Path not available: ${domain}${path_url}"
test ! -d $final_path \ test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path " || ynh_die --message="There is already a directory: $final_path "