diff --git a/README.md b/README.md index b4ad826..3e92ab1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ It integrates with the services you use to display information on the homepage ( - Very light-weight and fast. -**Shipped version:** 0.15.3~ynh2 +**Shipped version:** 0.15.3~ynh3 **Demo:** diff --git a/README_es.md b/README_es.md index 4819424..f835adf 100644 --- a/README_es.md +++ b/README_es.md @@ -29,7 +29,7 @@ It integrates with the services you use to display information on the homepage ( - Very light-weight and fast. -**Versión actual:** 0.15.3~ynh2 +**Versión actual:** 0.15.3~ynh3 **Demo:** diff --git a/README_eu.md b/README_eu.md index fe34f98..19fbe6a 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ It integrates with the services you use to display information on the homepage ( - Very light-weight and fast. -**Paketatutako bertsioa:** 0.15.3~ynh2 +**Paketatutako bertsioa:** 0.15.3~ynh3 **Demoa:** diff --git a/README_fr.md b/README_fr.md index e797bb2..cfefa2a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Il s'intègre aux services que vous utilisez pour afficher des informations sur - Des widgets pouvant afficher tous types d'informations. -**Version incluse :** 0.15.3~ynh2 +**Version incluse :** 0.15.3~ynh3 **Démo :** diff --git a/README_gl.md b/README_gl.md index 12c3f60..615601a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ It integrates with the services you use to display information on the homepage ( - Very light-weight and fast. -**Versión proporcionada:** 0.15.3~ynh2 +**Versión proporcionada:** 0.15.3~ynh3 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a58c624..209b4f8 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -29,7 +29,7 @@ It integrates with the services you use to display information on the homepage ( - Very light-weight and fast. -**分发版本：** 0.15.3~ynh2 +**分发版本：** 0.15.3~ynh3 **演示：** diff --git a/conf/systemd.service b/conf/systemd.service index 8d617b2..947248d 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -Environment="PATH=__ENV_PATH__" +Environment="__YNH_NODE_LOAD_PATH__" Environment="NODE_ENV=production" Environment="PORT=__PORT__" ExecStart=/usr/bin/yarn start diff --git a/manifest.toml b/manifest.toml index 962014f..ef9e9c0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Homarr" description.en = "Customizable browser's home page to interact with your homeserver's Docker containers" description.fr = "Page d'accueil personnalisable pour interagir avec les conteneurs Docker de votre serveur" -version = "0.15.3~ynh2" +version = "0.15.3~ynh3" maintainers = ["eric_G"] diff --git a/scripts/backup b/scripts/backup index f8e82aa..38d96c5 100755 --- a/scripts/backup +++ b/scripts/backup @@ -22,15 +22,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= diff --git a/scripts/install b/scripts/install index e17d956..efb2242 100755 --- a/scripts/install +++ b/scripts/install @@ -32,14 +32,13 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# NGINX CONFIGURATION +# APP INITIAL CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=1 +ynh_script_progression --message="Adding $app's configuration files..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config diff --git a/scripts/remove b/scripts/remove index 04dca7f..d2f5c3e 100755 --- a/scripts/remove +++ b/scripts/remove @@ -10,10 +10,9 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# STANDARD REMOVE -#================================================= -# REMOVE SERVICE INTEGRATION IN YUNOHOST +# REMOVE SYSTEM CONFIGURATIONS #================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null diff --git a/scripts/restore b/scripts/restore index 4c7b6e9..05f50ef 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,9 +31,9 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=1 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= -# RESTORE THE NGINX CONFIGURATION +# RESTORE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -43,9 +43,9 @@ systemctl enable $app.service --quiet yunohost service add $app --description="Customizable browser's home page" --log="/var/log/$app/$app.log" #================================================= -# START SYSTEMD SERVICE +# RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" diff --git a/scripts/upgrade b/scripts/upgrade index 4ffd971..50886fc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,12 +12,6 @@ source /usr/share/yunohost/helpers secret=$(ynh_string_random --length=24) timezone=$(cat /etc/timezone) -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -30,14 +24,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -51,14 +41,13 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= -# NGINX CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config -env_path="$PATH" # Create a dedicated systemd config ynh_add_systemd_config