diff --git a/README.md b/README.md index a972912..cb12cc5 100644 --- a/README.md +++ b/README.md @@ -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 -**Shipped version:** 1.18.1~ynh3 +**Shipped version:** 1.18.1~ynh4 **Demo:** https://demo.freshrss.org @@ -38,7 +38,6 @@ API (mini) How To: ## Documentation and resources * Official app website: http://freshrss.org/ -* Official user documentation: https://yunohost.org/apps * Official admin documentation: https://freshrss.github.io/FreshRSS/ * Upstream app code repository: https://github.com/FreshRSS/FreshRSS * YunoHost documentation for this app: https://yunohost.org/app_freshrss diff --git a/README_fr.md b/README_fr.md index 2561f87..763f893 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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 -**Version incluse :** 1.18.1~ynh3 +**Version incluse :** 1.18.1~ynh4 **Démo :** https://demo.freshrss.org @@ -34,7 +34,6 @@ API (mini) How To: ## Documentations et ressources * 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/ * Dépôt de code officiel de l'app : https://github.com/FreshRSS/FreshRSS * Documentation YunoHost pour cette app : https://yunohost.org/app_freshrss diff --git a/manifest.json b/manifest.json index 75a6d53..1e699a0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,14 +6,13 @@ "en": "RSS aggregator with a nice and mobile-friendly design", "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/", "upstream": { "license": "AGPL-3.0-only", "website": "http://freshrss.org/", "demo": "https://demo.freshrss.org", "admindoc": "https://freshrss.github.io/FreshRSS/", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/FreshRSS/FreshRSS" }, "license": "AGPL-3.0-only", @@ -34,8 +33,7 @@ "install": [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", @@ -46,8 +44,7 @@ { "name": "admin", "type": "user", - "optional": false, - "example": "homer" + "optional": false }, { "name": "is_public", diff --git a/scripts/change_url b/scripts/change_url index 2a27927..4c1c94a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -128,7 +128,7 @@ fi # 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 diff --git a/scripts/restore b/scripts/restore index bb5a383..42773f4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= 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 \ || ynh_die --message="There is already a directory: $final_path "