From 8ee5d70ed2cfc50933c63329d927a23395ec9114 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 18 Jan 2021 09:42:22 +0100 Subject: [PATCH] Fix linter warnings --- README.md | 13 ++-- README_fr.md | 14 ++-- check_process | 2 - manifest.json | 12 ++-- scripts/_common.sh | 157 +-------------------------------------------- scripts/backup | 13 ++-- 6 files changed, 25 insertions(+), 186 deletions(-) diff --git a/README.md b/README.md index fca5e4e..9017f7c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Unattended-upgrades for YunoHost [![Integration level](https://dash.yunohost.org/integration/unattended_upgrades.svg)](https://dash.yunohost.org/appci/app/unattended_upgrades) ![](https://ci-apps.yunohost.org/ci/badges/unattended_upgrades.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/unattended_upgrades.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-) -[![Install Unattended-upgrades with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=unattended_upgrades) +[![Install Unattended-upgrades with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=unattended_upgrades) *[Lire ce readme en français.](./README_fr.md)* @@ -23,13 +23,13 @@ No demo available. ## Configuration Have a look to the following config files for Unattended-upgrades - * /etc/apt/apt.conf.d/50unattended-upgrades - * /etc/apt/apt.conf.d/02periodic + * `/etc/apt/apt.conf.d/50unattended-upgrades` + * `/etc/apt/apt.conf.d/02periodic` And this one for Apticron - * /etc/apticron/apticron.conf + * `/etc/apticron/apticron.conf` With its cron file - * /etc/cron.d/apticron + * `/etc/cron.d/apticron` ## Documentation @@ -58,8 +58,7 @@ With its cron file --- -Developers infos ----------------- +## Developers infos Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/unattended_upgrades_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index 5f91225..947bf32 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Unattended-upgrades pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/unattended_upgrades.svg)](https://dash.yunohost.org/appci/app/unattended_upgrades) ![](https://ci-apps.yunohost.org/ci/badges/unattended_upgrades.status.svg) [![](https://ci-apps.yunohost.org/ci/badges/unattended_upgrades.maintain.svg)](https://github.com/YunoHost/Apps/#what-to-do-if-i-cant-maintain-my-app-anymore-) -[![Installer Unattended-upgrades avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=unattended_upgrades) +[![Installer Unattended-upgrades avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=unattended_upgrades) *[Read this readme in english.](./README.md)* @@ -23,13 +23,13 @@ Aucune démo pour cette application. ## Configuration Regardez les fichiers de configuration suivant pour Unattended-upgrades - * /etc/apt/apt.conf.d/50unattended-upgrades - * /etc/apt/apt.conf.d/02periodic + * `/etc/apt/apt.conf.d/50unattended-upgrades` + * `/etc/apt/apt.conf.d/02periodic` Et celui-ci pour Apticron - * /etc/apticron/apticron.conf + * `/etc/apticron/apticron.conf` Avec son cron - * /etc/cron.d/apticron + * `/etc/cron.d/apticron` ## Documentation @@ -45,7 +45,6 @@ Avec son cron * x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/unattended_upgrades%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/unattended_upgrades/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/unattended_upgrades%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/unattended_upgrades/) -* Buster x86-64b - [![](https://ci-buster.nohost.me/ci/logs/unattended_upgrades%20%28Apps%29.svg)](https://ci-buster.nohost.me/ci/apps/unattended_upgrades/) ## Limitations @@ -58,8 +57,7 @@ Avec son cron --- -Informations à l'intention des développeurs ----------------- +## Informations à l'intention des développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/unattended_upgrades_ynh/tree/testing). diff --git a/check_process b/check_process index 0e71ef0..d9b8921 100644 --- a/check_process +++ b/check_process @@ -61,8 +61,6 @@ setup_nourl=1 upgrade=1 backup_restore=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=change diff --git a/manifest.json b/manifest.json index 770df00..3f1ade3 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Daily automatic upgrades", "fr": "Mise à jour automatique quotidienne." }, - "version": "1.0~ynh5", + "version": "1.0~ynh6", "url": "https://wiki.debian.org/UnattendedUpgrades", "license": "GPL-2.0-or-later", "maintainer": { @@ -18,7 +18,7 @@ "email": "maniackc_dev@crudelis.fr" }], "requirements": { - "yunohost": ">= 3.6.0" + "yunohost": ">= 3.8.1" }, "multi_instance": false, "services": [], @@ -38,7 +38,7 @@ "name": "ynh_update", "type": "boolean", "ask": { - "en": "Would you like to update YunoHost packages automatically ?", + "en": "Would you like to update YunoHost packages automatically?", "fr": "Souhaitez-vous mettre à jour les paquets YunoHost automatiquement ?" }, "default": true @@ -47,7 +47,7 @@ "name": "previous_apticron", "type": "boolean", "ask": { - "en": "Would you like to receive an email to inform which upgrades need to be done ?", + "en": "Would you like to receive an email to inform which upgrades need to be done?", "fr": "Souhaitez-vous recevoir un email pour vous informer des mises à jour nécessaires ?" }, "default": true @@ -56,7 +56,7 @@ "name": "after_apticron", "type": "boolean", "ask": { - "en": "Would you like to receive an email to verify if there any upgrades left after each auto upgrade ?", + "en": "Would you like to receive an email to verify if there any upgrades left after each auto upgrade?", "fr": "Souhaitez-vous recevoir un email pour vérifier s'il reste des mises à jour après chaque mise à niveau automatique ?" }, "default": true @@ -65,7 +65,7 @@ "name": "unattended_mail", "type": "string", "ask": { - "en": "Would you like to receive an email from Unattended-Upgrades ?", + "en": "Would you like to receive an email from Unattended-Upgrades?", "fr": "Souhaitez-vous recevoir un email de Unattended-Upgrades ?" }, "choices": ["If an upgrade has been done", "Only if there was an error", "Never"], diff --git a/scripts/_common.sh b/scripts/_common.sh index 3770c0f..f129f79 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -51,7 +51,7 @@ ynh_multimedia_build_main_dir () { local checksum="806a827ba1902d6911095602a9221181" # Download yunohost.multimedia scripts - wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz + wget -nv https://github.com/YunoHost-Apps/yunohost.multimedia/archive/${ynh_media_release}.tar.gz 2>&1 # Check the control sum echo "${checksum} ${ynh_media_release}.tar.gz" | md5sum -c --status \ @@ -581,161 +581,6 @@ ynh_check_ram () { #================================================= -# Define the values to configure php-fpm -# -# usage: ynh_get_scalable_phpfpm --usage=usage --footprint=footprint [--print] -# | arg: -f, --footprint - Memory footprint of the service (low/medium/high). -# low - Less than 20Mb of ram by pool. -# medium - Between 20Mb and 40Mb of ram by pool. -# high - More than 40Mb of ram by pool. -# Or specify exactly the footprint, the load of the service as Mb by pool instead of having a standard value. -# To have this value, use the following command and stress the service. -# watch -n0.5 ps -o user,cmd,%cpu,rss -u APP -# -# | arg: -u, --usage - Expected usage of the service (low/medium/high). -# low - Personal usage, behind the sso. -# medium - Low usage, few people or/and publicly accessible. -# high - High usage, frequently visited website. -# -# | arg: -p, --print - Print the result -# -# -# -# The footprint of the service will be used to defined the maximum footprint we can allow, which is half the maximum RAM. -# So it will be used to defined 'pm.max_children' -# A lower value for the footprint will allow more children for 'pm.max_children'. And so for -# 'pm.start_servers', 'pm.min_spare_servers' and 'pm.max_spare_servers' which are defined from the -# value of 'pm.max_children' -# NOTE: 'pm.max_children' can't exceed 4 times the number of processor's cores. -# -# The usage value will defined the way php will handle the children for the pool. -# A value set as 'low' will set the process manager to 'ondemand'. Children will start only if the -# service is used, otherwise no child will stay alive. This config gives the lower footprint when the -# service is idle. But will use more proc since it has to start a child as soon it's used. -# Set as 'medium', the process manager will be at dynamic. If the service is idle, a number of children -# equal to pm.min_spare_servers will stay alive. So the service can be quick to answer to any request. -# The number of children can grow if needed. The footprint can stay low if the service is idle, but -# not null. The impact on the proc is a little bit less than 'ondemand' as there's always a few -# children already available. -# Set as 'high', the process manager will be set at 'static'. There will be always as many children as -# 'pm.max_children', the footprint is important (but will be set as maximum a quarter of the maximum -# RAM) but the impact on the proc is lower. The service will be quick to answer as there's always many -# children ready to answer. -ynh_get_scalable_phpfpm () { - local legacy_args=ufp - # Declare an array to define the options of this helper. - declare -Ar args_array=( [u]=usage= [f]=footprint= [p]=print ) - local usage - local footprint - local print - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - # Set all characters as lowercase - footprint=${footprint,,} - usage=${usage,,} - print=${print:-0} - - if [ "$footprint" = "low" ] - then - footprint=20 - elif [ "$footprint" = "medium" ] - then - footprint=35 - elif [ "$footprint" = "high" ] - then - footprint=50 - fi - - # Define the way the process manager handle child processes. - if [ "$usage" = "low" ] - then - php_pm=ondemand - elif [ "$usage" = "medium" ] - then - php_pm=dynamic - elif [ "$usage" = "high" ] - then - php_pm=static - else - ynh_die --message="Does not recognize '$usage' as an usage value." - fi - - # Get the total of RAM available, except swap. - local max_ram=$(ynh_check_ram --no_swap) - - less0() { - # Do not allow value below 1 - if [ $1 -le 0 ] - then - echo 1 - else - echo $1 - fi - } - - # Define pm.max_children - # The value of pm.max_children is the total amount of ram divide by 2 and divide again by the footprint of a pool for this app. - # So if php-fpm start the maximum of children, it won't exceed half of the ram. - php_max_children=$(( $max_ram / 2 / $footprint )) - # If process manager is set as static, use half less children. - # Used as static, there's always as many children as the value of pm.max_children - if [ "$php_pm" = "static" ] - then - php_max_children=$(( $php_max_children / 2 )) - fi - php_max_children=$(less0 $php_max_children) - - # To not overload the proc, limit the number of children to 4 times the number of cores. - local core_number=$(nproc) - local max_proc=$(( $core_number * 4 )) - if [ $php_max_children -gt $max_proc ] - then - php_max_children=$max_proc - fi - - if [ "$php_pm" = "dynamic" ] - then - # Define pm.start_servers, pm.min_spare_servers and pm.max_spare_servers for a dynamic process manager - php_min_spare_servers=$(( $php_max_children / 8 )) - php_min_spare_servers=$(less0 $php_min_spare_servers) - - php_max_spare_servers=$(( $php_max_children / 2 )) - php_max_spare_servers=$(less0 $php_max_spare_servers) - - php_start_servers=$(( $php_min_spare_servers + ( $php_max_spare_servers - $php_min_spare_servers ) /2 )) - php_start_servers=$(less0 $php_start_servers) - else - php_min_spare_servers=0 - php_max_spare_servers=0 - php_start_servers=0 - fi - - if [ $print -eq 1 ] - then - ynh_debug --message="Footprint=${footprint}Mb by pool." - ynh_debug --message="Process manager=$php_pm" - ynh_debug --message="Max RAM=${max_ram}Mb" - if [ "$php_pm" != "static" ]; then - ynh_debug --message="\nMax estimated footprint=$(( $php_max_children * $footprint ))" - ynh_debug --message="Min estimated footprint=$(( $php_min_spare_servers * $footprint ))" - fi - if [ "$php_pm" = "dynamic" ]; then - ynh_debug --message="Estimated average footprint=$(( $php_max_spare_servers * $footprint ))" - elif [ "$php_pm" = "static" ]; then - ynh_debug --message="Estimated footprint=$(( $php_max_children * $footprint ))" - fi - ynh_debug --message="\nRaw php-fpm values:" - ynh_debug --message="pm.max_children = $php_max_children" - if [ "$php_pm" = "dynamic" ]; then - ynh_debug --message="pm.start_servers = $php_start_servers" - ynh_debug --message="pm.min_spare_servers = $php_min_spare_servers" - ynh_debug --message="pm.max_spare_servers = $php_max_spare_servers" - fi - fi -} - -#================================================= - # Execute a command as another user # usage: exec_as USER COMMAND [ARG ...] exec_as() { diff --git a/scripts/backup b/scripts/backup index bfc9b77..c580d77 100644 --- a/scripts/backup +++ b/scripts/backup @@ -19,16 +19,18 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME #================================================= -# SPECIFIC BACKUP +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP UNATTENDED-UPGRADES CONFIG #================================================= -ynh_script_progression --message="Backing up unattended-upgrades config..." ynh_backup --src_path="/etc/apt/apt.conf.d/50unattended-upgrades" # Backup also the backup of the config file @@ -37,21 +39,18 @@ ynh_backup --src_path="/etc/apt/50unattended-upgrades.backup" #================================================= # BACKUP APT PERIODIC #================================================= -ynh_script_progression --message="Backing up APT periodic..." ynh_backup --src_path="/etc/apt/apt.conf.d/02periodic" #================================================= # BACKUP APTICRON CONFIG #================================================= -ynh_script_progression --message="Backing up Apticron config..." ynh_backup --src_path="/etc/apticron/apticron.conf" #================================================= # BACKUP THE CRON FILE #================================================= -ynh_script_progression --message="Backing up cron file..." ynh_backup --src_path="/etc/cron.d/apticron" @@ -59,4 +58,4 @@ ynh_backup --src_path="/etc/cron.d/apticron" # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."