diff --git a/README.md b/README.md index bcb6d6a..a4cfdd2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Miniflux for YunoHost [![Integration level](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg) -[![Install Simple Torrent with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux/) +[![Install Miniflux with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux/) *[Lire ce readme en français.](./README_fr.md)* @@ -20,9 +20,7 @@ Miniflux is a minimalist and opinionated feed reader. ## Configuration -Most of the items can be edited in Web-UI on the fly in the config board. - -You can also configure Miniflux by editing this file `/etc/miniflux.conf` using the [documentation](https://miniflux.app/docs/configuration.html). +You can also configure Miniflux by editing this file `/var/www/miniflux/miniflux.conf` using the [documentation](https://miniflux.app/docs/configuration.html). ## Documentation diff --git a/README_fr.md b/README_fr.md index 60141df..d88f870 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,9 +20,7 @@ Miniflux est un agrégateur de flux RSS minimaliste. ## Configuration -La plupart des éléments peuvent être modifiés à la volée dans Web-UI dans la page de configuration. - -Vous pouvez configurer Simple Torrent en modifiant le fichier `/etc/miniflux.conf` en vous aidant de la [documentation](https://miniflux.app/docs/configuration.html). +Vous pouvez configurer Miniflux en modifiant le fichier `/var/www/miniflux/miniflux.conf` en vous aidant de la [documentation](https://miniflux.app/docs/configuration.html). ## Documentation diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..81408ee 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1,3 @@ +## Configuration + +You can also configure Miniflux by editing this file `/var/www/miniflux/miniflux.conf` using the [documentation](https://miniflux.app/docs/configuration.html). \ No newline at end of file diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md new file mode 100644 index 0000000..bb4d9d9 --- /dev/null +++ b/doc/DISCLAIMER_fr.md @@ -0,0 +1,3 @@ +## Configuration + +Vous pouvez configurer Miniflux en modifiant le fichier `/var/www/miniflux/miniflux.conf` en vous aidant de la [documentation](https://miniflux.app/docs/configuration.html). \ No newline at end of file diff --git a/scripts/install b/scripts/install index fd48a0a..9307a3c 100644 --- a/scripts/install +++ b/scripts/install @@ -114,9 +114,9 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding a configuration file..." --weight=1 -ynh_add_config --template="../conf/miniflux.conf" --destination="$final_path/miniflux.conf" +ynh_add_config --template="../conf/miniflux.conf" --destination="$final_path/$app.conf" -chmod 600 "$final_path/miniflux.conf" +chmod 600 "$final_path/$app.conf" #================================================= # SETUP SYSTEMD diff --git a/scripts/upgrade b/scripts/upgrade index 9df7672..67c387f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) -peer_port=$(ynh_app_setting_get --app=$app --key=peer_port) architecture=$(ynh_detect_arch) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name @@ -68,6 +67,14 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action=stop --log_path=systemd +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -77,7 +84,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir=$final_path --source_id="$architecture" --keep="$final_path/miniflux.conf" + ynh_setup_source --dest_dir=$final_path --source_id="$architecture" --keep="$final_path/$app.conf" fi #================================================= @@ -95,14 +102,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=10 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 - -# Create a dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # SETUP SYSTEMD #=================================================