From 4a6886aed9dd56e4045d9110ef751ddb059b11e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 7 Oct 2022 15:02:43 +0200 Subject: [PATCH 1/3] Install in /var/www --- doc/DISCLAIMER.md | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7491d39..4642af8 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -3,4 +3,4 @@ * Email required for administation (uses "magic links" instead of admin passwords) * You should manually configure the app after installation. -* You should edit /opt/yunohost/fider/run_fider to add environment variables, e.g for Github integration +* You should edit /var/www/fider/run_fider to add environment variables, e.g for Github integration diff --git a/scripts/install b/scripts/install index db0c41a..7b65a58 100755 --- a/scripts/install +++ b/scripts/install @@ -37,7 +37,7 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_script_progression --message="Validating installation parameters..." --weight=1 -final_path=/opt/yunohost/$app +final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path From d8b8ff2b3d23cbb94f044a486509dbb52c5dddf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Fri, 7 Oct 2022 15:03:03 +0200 Subject: [PATCH 2/3] Fix upgrade, remove --time --- scripts/restore | 2 +- scripts/upgrade | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 1405c4b..1f1aaf2 100755 --- a/scripts/restore +++ b/scripts/restore @@ -88,7 +88,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index ac1df36..7519f47 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,8 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) admin=$(ynh_app_setting_get --app=$app --key=admin) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$(ynh_app_setting_get --app=$app --key=db_user) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) secret=$(ynh_app_setting_get --app=$app --key=secret) port=$(ynh_app_setting_get --app=$app --key=port) @@ -98,7 +100,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config From 222e1dc945b6e2b5467645d083502d3f304eb4ea Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Oct 2022 22:19:50 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 3 +-- README_fr.md | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3c61f27..166c8b3 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ Fider is a feedback portal that helps teams collect and prioritize customer feed **Shipped version:** 0.21.1~ynh1 - **Demo:** https://feedback.fider.io ## Screenshots @@ -42,7 +41,7 @@ Fider is a feedback portal that helps teams collect and prioritize customer feed * Email required for administation (uses "magic links" instead of admin passwords) * You should manually configure the app after installation. -* You should edit /opt/yunohost/fider/run_fider to add environment variables, e.g for Github integration +* You should edit /var/www/fider/run_fider to add environment variables, e.g for Github integration ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 67b552c..49b8b05 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,8 +26,7 @@ Fider is a feedback portal that helps teams collect and prioritize customer feed - Markdown support -**Version incluse :** 0.21.1~ynh1 - +**Version incluse :** 0.21.1~ynh1 **Démo :** https://feedback.fider.io @@ -42,7 +41,7 @@ Fider is a feedback portal that helps teams collect and prioritize customer feed * Email required for administation (uses "magic links" instead of admin passwords) * You should manually configure the app after installation. -* You should edit /opt/yunohost/fider/run_fider to add environment variables, e.g for Github integration +* You should edit /var/www/fider/run_fider to add environment variables, e.g for Github integration ## Documentations et ressources