From 10d33d57532c214eb362097a7070eecb520794f6 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 24 May 2020 15:16:07 +0200 Subject: [PATCH 01/20] Fix ynh_add_fpm_config with template in restore --- data/helpers.d/php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/helpers.d/php b/data/helpers.d/php index 9b9df64f9..e7b7887c0 100644 --- a/data/helpers.d/php +++ b/data/helpers.d/php @@ -148,8 +148,12 @@ ynh_add_fpm_config () { if [ $use_template -eq 1 ] then - # Usage 1, use the template in ../conf/php-fpm.conf - cp ../conf/php-fpm.conf "$finalphpconf" + # Usage 1, use the template in conf/php-fpm.conf + local phpfpm_path="../conf/php-fpm.conf" + if [ ! -e "$phpfpm_path" ]; then + phpfpm_path="../settings/conf/php-fpm.conf" # Into the restore script, the php-fpm template is not at the same place + fi + cp "$phpfpm_path" "$finalphpconf" ynh_replace_string --match_string="__NAMETOCHANGE__" --replace_string="$app" --target_file="$finalphpconf" ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$finalphpconf" ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$finalphpconf" From 94cecf682dbdf8134bbc9a6bc2f2ca9e0a06ed87 Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Thu, 28 May 2020 07:15:46 +0200 Subject: [PATCH 02/20] Update data/helpers.d/php Co-authored-by: Alexandre Aubin --- data/helpers.d/php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/helpers.d/php b/data/helpers.d/php index e7b7887c0..3117be2e6 100644 --- a/data/helpers.d/php +++ b/data/helpers.d/php @@ -153,6 +153,8 @@ ynh_add_fpm_config () { if [ ! -e "$phpfpm_path" ]; then phpfpm_path="../settings/conf/php-fpm.conf" # Into the restore script, the php-fpm template is not at the same place fi + # Make sure now that the template indeed exists + [ -e "$phpfpm_path" ] || ynh_die --message="Unable to find template to configure php-fpm." cp "$phpfpm_path" "$finalphpconf" ynh_replace_string --match_string="__NAMETOCHANGE__" --replace_string="$app" --target_file="$finalphpconf" ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$finalphpconf" From 17eec25ed2b95994f464bbedda09f0d4d59fb292 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 28 May 2020 15:03:23 +0200 Subject: [PATCH 03/20] Buuuurn glances --- data/hooks/conf_regen/40-glances | 36 -------------------------------- src/yunohost/regenconf.py | 5 +++++ 2 files changed, 5 insertions(+), 36 deletions(-) delete mode 100755 data/hooks/conf_regen/40-glances diff --git a/data/hooks/conf_regen/40-glances b/data/hooks/conf_regen/40-glances deleted file mode 100755 index 70b8f4b5a..000000000 --- a/data/hooks/conf_regen/40-glances +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -set -e - -do_pre_regen() { - pending_dir=$1 - - cd /usr/share/yunohost/templates/glances - - install -D -m 644 glances.default "${pending_dir}/etc/default/glances" -} - -do_post_regen() { - regen_conf_files=$1 - - [[ -z "$regen_conf_files" ]] \ - || service glances restart -} - -FORCE=${2:-0} -DRY_RUN=${3:-0} - -case "$1" in - pre) - do_pre_regen $4 - ;; - post) - do_post_regen $4 - ;; - *) - echo "hook called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/src/yunohost/regenconf.py b/src/yunohost/regenconf.py index d1c90ceee..53deb7073 100644 --- a/src/yunohost/regenconf.py +++ b/src/yunohost/regenconf.py @@ -346,6 +346,11 @@ def _save_regenconf_infos(infos): Keyword argument: categories -- A dict containing the regenconf infos """ + + # Ugly hack to get rid of legacy glances stuff + if "glances" in infos: + del infos["glances"] + try: with open(REGEN_CONF_FILE, 'w') as f: yaml.safe_dump(infos, f, default_flow_style=False) From 852cd14c4bf1301e197fe2b37d077bbed386420f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 2 Jun 2020 16:48:19 +0200 Subject: [PATCH 04/20] Force external resolution for reverse DNS dig --- data/hooks/diagnosis/24-mail.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/hooks/diagnosis/24-mail.py b/data/hooks/diagnosis/24-mail.py index bc159c3b7..a483e676d 100644 --- a/data/hooks/diagnosis/24-mail.py +++ b/data/hooks/diagnosis/24-mail.py @@ -126,7 +126,7 @@ class MailDiagnoser(Diagnoser): query += '.ip6.arpa' # Do the DNS Query - status, value = dig(query, 'PTR') + status, value = dig(query, 'PTR', resolvers="force_external") if status == "nok": yield dict(meta={"test": "mail_fcrdns", "ipversion": ipversion}, data={"ip": ip, "ehlo_domain": self.ehlo_domain}, From e24191ce643772b785b793231b466bc51c902f9a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 2 Jun 2020 17:00:52 +0200 Subject: [PATCH 05/20] Make sure mysql is an alias to mariadb --- data/hooks/conf_regen/34-mysql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/hooks/conf_regen/34-mysql b/data/hooks/conf_regen/34-mysql index 43f9fdde1..74bafbf71 100755 --- a/data/hooks/conf_regen/34-mysql +++ b/data/hooks/conf_regen/34-mysql @@ -15,6 +15,16 @@ do_pre_regen() { do_post_regen() { regen_conf_files=$1 + # mysql is supposed to be an alias to mariadb... but in some weird case is not + # c.f. https://forum.yunohost.org/t/mysql-ne-fonctionne-pas/11661 + # Playing with enable/disable allows to recreate the proper symlinks. + if [ ! -e /etc/systemd/system/mysql.service ] + then + systemctl disable mysql -q + systemctl disable mariadb -q + systemctl enable mariadb -q + fi + if [ ! -f /etc/yunohost/mysql ]; then # ensure that mysql is running From b52f8456a9d8514d07825586cdfe9e6911fa828e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Jun 2020 18:47:04 +0200 Subject: [PATCH 06/20] Tell apt-daily to gtfo to prevent it from messing with dpkg/apt locks --- .gitlab/ci/install.gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab/ci/install.gitlab-ci.yml b/.gitlab/ci/install.gitlab-ci.yml index 20a191757..8ca18b60e 100644 --- a/.gitlab/ci/install.gitlab-ci.yml +++ b/.gitlab/ci/install.gitlab-ci.yml @@ -26,4 +26,12 @@ install-postinstall: script: - apt update - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb + - systemctl -q stop apt-daily.timer + - systemctl -q stop apt-daily-upgrade.timer + - systemctl -q stop apt-daily.service + - systemctl -q stop apt-daily-upgrade.servic + - systemctl -q disable apt-daily.timer + - systemctl -q disable apt-daily-upgrade.timer + - systemctl -q disable apt-daily.service + - systemctl -q disable apt-daily-upgrade.servicee - yunohost tools postinstall -d domain.tld -p the_password --ignore-dyndns From c8b06bd8aacfb5d015e3879c98f5ccba1dbafd02 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Jun 2020 18:51:15 +0200 Subject: [PATCH 07/20] Tell apt-daily to gtfo to prevent it from messing with dpkg/apt locks --- .gitlab/ci/install.gitlab-ci.yml | 4 ++-- .gitlab/ci/test.gitlab-ci.yml | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/install.gitlab-ci.yml b/.gitlab/ci/install.gitlab-ci.yml index 8ca18b60e..28d0bb41b 100644 --- a/.gitlab/ci/install.gitlab-ci.yml +++ b/.gitlab/ci/install.gitlab-ci.yml @@ -29,9 +29,9 @@ install-postinstall: - systemctl -q stop apt-daily.timer - systemctl -q stop apt-daily-upgrade.timer - systemctl -q stop apt-daily.service - - systemctl -q stop apt-daily-upgrade.servic + - systemctl -q stop apt-daily-upgrade.service - systemctl -q disable apt-daily.timer - systemctl -q disable apt-daily-upgrade.timer - systemctl -q disable apt-daily.service - - systemctl -q disable apt-daily-upgrade.servicee + - systemctl -q disable apt-daily-upgrade.service - yunohost tools postinstall -d domain.tld -p the_password --ignore-dyndns diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 06e9eeed6..900d68bc3 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -1,4 +1,12 @@ .install_debs: &install_debs + - systemctl -q stop apt-daily.timer + - systemctl -q stop apt-daily-upgrade.timer + - systemctl -q stop apt-daily.service + - systemctl -q stop apt-daily-upgrade.service + - systemctl -q disable apt-daily.timer + - systemctl -q disable apt-daily-upgrade.timer + - systemctl -q disable apt-daily.service + - systemctl -q disable apt-daily-upgrade.service - apt update - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb From 03432349d72959b9874f197d9a6a1b75dced0559 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Jun 2020 19:29:32 +0200 Subject: [PATCH 08/20] Add -o Acquire::Retries=3 to fix some stupid issues happening sometimes --- .gitlab/ci/install.gitlab-ci.yml | 5 +++-- .gitlab/ci/test.gitlab-ci.yml | 2 +- data/helpers.d/apt | 2 +- src/yunohost/tools.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab/ci/install.gitlab-ci.yml b/.gitlab/ci/install.gitlab-ci.yml index 28d0bb41b..41f31d137 100644 --- a/.gitlab/ci/install.gitlab-ci.yml +++ b/.gitlab/ci/install.gitlab-ci.yml @@ -16,7 +16,7 @@ upgrade: extends: .install-stage image: "after-install" script: - - apt update + - apt-get update -o Acquire::Retries=3 - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb @@ -24,7 +24,8 @@ install-postinstall: extends: .install-stage image: "before-install" script: - - apt update + - apt-get update -o Acquire::Retries=3 + - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb - systemctl -q stop apt-daily.timer - systemctl -q stop apt-daily-upgrade.timer diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 900d68bc3..12379342a 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -7,7 +7,7 @@ - systemctl -q disable apt-daily-upgrade.timer - systemctl -q disable apt-daily.service - systemctl -q disable apt-daily-upgrade.service - - apt update + - apt-get update -o Acquire::Retries=3 - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb .test-stage: diff --git a/data/helpers.d/apt b/data/helpers.d/apt index 31f7d4ffe..c48cc0add 100644 --- a/data/helpers.d/apt +++ b/data/helpers.d/apt @@ -100,7 +100,7 @@ ynh_package_version() { # Requires YunoHost version 2.4.0.3 or higher. ynh_apt() { ynh_wait_dpkg_free - LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get --assume-yes --quiet -o=Dpkg::Use-Pty=0 $@ + LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get --assume-yes --quiet -o=Acquire::Retries=3 -o=Dpkg::Use-Pty=0 $@ } # Update package index files diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 0e9d23e87..3b683e967 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -416,7 +416,7 @@ def tools_update(apps=False, system=False): # Update APT cache # LC_ALL=C is here to make sure the results are in english - command = "LC_ALL=C apt update" + command = "LC_ALL=C apt-get update -o Acquire::Retries=3" # Filter boring message about "apt not having a stable CLI interface" # Also keep track of wether or not we encountered a warning... From 489c6b67c3ac99cf53761f9bbc868887a3a54b21 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Jun 2020 19:44:17 +0200 Subject: [PATCH 09/20] Zblerg Aleks bad copy pasta --- .gitlab/ci/install.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab/ci/install.gitlab-ci.yml b/.gitlab/ci/install.gitlab-ci.yml index 41f31d137..eb5187e11 100644 --- a/.gitlab/ci/install.gitlab-ci.yml +++ b/.gitlab/ci/install.gitlab-ci.yml @@ -26,7 +26,6 @@ install-postinstall: script: - apt-get update -o Acquire::Retries=3 - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb - - DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes apt --assume-yes -o Dpkg::Options::="--force-confold" --allow-downgrades install ./$YNH_BUILD_DIR/*.deb - systemctl -q stop apt-daily.timer - systemctl -q stop apt-daily-upgrade.timer - systemctl -q stop apt-daily.service From ca89607d9dc4afc0728a184e7bd708b48e12b2b4 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Jun 2020 23:38:59 +0200 Subject: [PATCH 10/20] Make sure to stop the old mysql and that mariadb is started --- data/hooks/conf_regen/34-mysql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/hooks/conf_regen/34-mysql b/data/hooks/conf_regen/34-mysql index 74bafbf71..ac2395f34 100755 --- a/data/hooks/conf_regen/34-mysql +++ b/data/hooks/conf_regen/34-mysql @@ -20,9 +20,11 @@ do_post_regen() { # Playing with enable/disable allows to recreate the proper symlinks. if [ ! -e /etc/systemd/system/mysql.service ] then + systemctl stop mysql -q systemctl disable mysql -q systemctl disable mariadb -q systemctl enable mariadb -q + systemctl is-active mariadb -q || systemctl start mariadb fi if [ ! -f /etc/yunohost/mysql ]; then From 3d66eaec01e5e6f4066f1d29c2d254030e953f92 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Jun 2020 00:48:18 +0200 Subject: [PATCH 11/20] Retry wget on non-critical failures to try to avoid tmp dns issues --- data/helpers.d/utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/utils b/data/helpers.d/utils index 9c2f40618..1ea936aa7 100644 --- a/data/helpers.d/utils +++ b/data/helpers.d/utils @@ -145,7 +145,7 @@ ynh_setup_source () { cp $local_src $src_filename else # If not, download the source # Timeout option is here to enforce the timeout on dns query and tcp connect (c.f. man wget) - local out=`wget --timeout 900 --no-verbose --output-document=$src_filename $src_url 2>&1` || ynh_print_err --message="$out" + local out=`wget --tries 3 --no-dns-cache --timeout 900 --no-verbose --output-document=$src_filename $src_url 2>&1` || ynh_print_err --message="$out" fi # Check the control sum From 55036fad2c79724341ee76e8a5b3e28a526ee395 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Jun 2020 01:18:52 +0200 Subject: [PATCH 12/20] Calling ynh_print_err in case of error didn't work, and we probably want a ynh_die here --- data/helpers.d/utils | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/helpers.d/utils b/data/helpers.d/utils index 1ea936aa7..8647002e0 100644 --- a/data/helpers.d/utils +++ b/data/helpers.d/utils @@ -144,8 +144,13 @@ ynh_setup_source () { then # Use the local source file if it is present cp $local_src $src_filename else # If not, download the source + # NB. we have to declare the var as local first, + # otherwise 'local foo=$(false) || echo 'pwet'" does'nt work + # because local always return 0 ... + local out # Timeout option is here to enforce the timeout on dns query and tcp connect (c.f. man wget) - local out=`wget --tries 3 --no-dns-cache --timeout 900 --no-verbose --output-document=$src_filename $src_url 2>&1` || ynh_print_err --message="$out" + out=$(wget --tries 3 --no-dns-cache --timeout 900 --no-verbose --output-document=$src_filename $src_url 2>&1) \ + || ynh_die --message="$out" fi # Check the control sum From fb9c019c8637d1515479f21281a577ba3cd12fb1 Mon Sep 17 00:00:00 2001 From: xaloc33 Date: Tue, 26 May 2020 10:24:15 +0000 Subject: [PATCH 13/20] Translated using Weblate (Catalan) Currently translated at 100.0% (640 of 640 strings) Translation: YunoHost/core Translate-URL: https://translate.yunohost.org/projects/yunohost/core/ca/ --- locales/ca.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/locales/ca.json b/locales/ca.json index 52f2e7f87..8426ccf1e 100644 --- a/locales/ca.json +++ b/locales/ca.json @@ -537,7 +537,7 @@ "diagnosis_dns_good_conf": "Els registres DNS han estat correctament configurats pel domini {domain} (categoria {category})", "diagnosis_dns_bad_conf": "Alguns registres DNS són incorrectes o no existeixen pel domini {domain} (categoria {category})", "diagnosis_dns_missing_record": "Segons la configuració DNS recomanada, hauríeu d'afegir un registre DNS amb la següent informació.
Tipus: {type}
Nom: {name}
Valor: {value}", - "diagnosis_dns_discrepancy": "El registre DNS de tipus {type} i nom {name} no concorda amb la configuració recomanada.\nValor actual: {current}\nValor esperat: {value}", + "diagnosis_dns_discrepancy": "La configuració DNS següent sembla que no segueix la configuració recomanada:
Tipus: {type}
Nom: {name}
Valor actual: {current}
Valor esperat: {value}", "diagnosis_services_bad_status": "El servei {service} està {status} :(", "diagnosis_diskusage_verylow": "El lloc d'emmagatzematge {mountpoint} (en l'aparell {device}) només té disponibles {free} ({free_percent}%). Hauríeu de considerar alliberar una mica d'espai!", "diagnosis_diskusage_low": "El lloc d'emmagatzematge {mountpoint} (en l'aparell {device}) només té disponibles {free} ({free_percent}%). Aneu amb compte.", @@ -649,5 +649,6 @@ "diagnosis_domain_expiration_error": "Alguns dominis expiraran EN BREUS!", "diagnosis_domain_expires_in": "{domain} expirarà en {days} dies.", "diagnosis_swap_tip": "Vigileu i tingueu en compte que els servidor està allotjant memòria d'intercanvi en una targeta SD o en l'emmagatzematge SSD, això pot reduir dràsticament l'esperança de vida del dispositiu.", - "restore_already_installed_apps": "No s'han pogut restaurar les següents aplicacions perquè ja estan instal·lades: {apps}" + "restore_already_installed_apps": "No s'han pogut restaurar les següents aplicacions perquè ja estan instal·lades: {apps}", + "app_packaging_format_not_supported": "No es pot instal·lar aquesta aplicació ja que el format del paquet no és compatible amb la versió de YunoHost del sistema. Hauríeu de considerar actualitzar el sistema." } From f6718f56dab8b80b45e921d5e134f0ad3a292417 Mon Sep 17 00:00:00 2001 From: ppr Date: Tue, 26 May 2020 17:52:19 +0000 Subject: [PATCH 14/20] Translated using Weblate (French) Currently translated at 99.4% (636 of 640 strings) Translation: YunoHost/core Translate-URL: https://translate.yunohost.org/projects/yunohost/core/fr/ --- locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr.json b/locales/fr.json index 38a9ad5a7..bd32d7f08 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -426,7 +426,7 @@ "tools_upgrade_special_packages_completed": "La mise à jour des paquets de YunoHost est finie !\nPressez [Entrée] pour revenir à la ligne de commande", "dpkg_lock_not_available": "Cette commande ne peut pas être exécutée pour le moment car un autre programme semble utiliser le verrou de dpkg (le gestionnaire de package système)", "tools_upgrade_cant_unhold_critical_packages": "Impossible de conserver les paquets critiques…", - "tools_upgrade_special_packages_explanation": "La mise à niveau spéciale se poursuivra en arrière-plan. Veuillez ne pas lancer d'autres actions sur votre serveur pendant les 10 prochaines minutes (selon la vitesse du matériel). Après cela, vous devrez peut-être vous reconnecter à l'administrateur Web. Le journal de mise à niveau sera disponible dans Outils → Journal (dans le webadmin) ou en utilisant la « liste des journaux yunohost » (à partir de la ligne de commande).", + "tools_upgrade_special_packages_explanation": "La mise à niveau spécifique à YunoHost se poursuivra en arrière-plan. Veuillez ne pas lancer d'autres actions sur votre serveur pendant les 10 prochaines minutes (selon la vitesse du matériel). Après cela, vous devrez peut-être vous reconnecter à l'administrateur Web. Le journal de mise à niveau sera disponible dans Outils → Journal (dans le webadmin) ou en utilisant la « liste des journaux yunohost » (à partir de la ligne de commande).", "update_apt_cache_failed": "Impossible de mettre à jour le cache APT (gestionnaire de paquets Debian). Voici un extrait du fichier sources.list qui pourrait vous aider à identifier les lignes problématiques :\n{sourceslist}", "update_apt_cache_warning": "Des erreurs se sont produites lors de la mise à jour du cache APT (gestionnaire de paquets Debian). Voici un extrait des lignes du fichier sources.list qui pourrait vous aider à identifier les lignes problématiques :\n{sourceslist}", "backup_permission": "Permission de sauvegarde pour l’application {app:s}", From 434cd609d6b5abb7599b00b4f7dab93526810fce Mon Sep 17 00:00:00 2001 From: Leandro Noferini Date: Thu, 28 May 2020 19:37:44 +0000 Subject: [PATCH 15/20] Translated using Weblate (Italian) Currently translated at 19.7% (126 of 640 strings) Translation: YunoHost/core Translate-URL: https://translate.yunohost.org/projects/yunohost/core/it/ --- locales/it.json | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/locales/it.json b/locales/it.json index f254d3407..cbb4bf5c3 100644 --- a/locales/it.json +++ b/locales/it.json @@ -1,7 +1,7 @@ { "app_already_installed": "{app:s} è già installata", "app_extraction_failed": "Impossibile estrarre i file di installazione", - "app_not_installed": "{app:s} non è installata", + "app_not_installed": "Impossibile trovare l'applicazione '{app:s}' nell'elenco delle applicazioni installate: {all_apps}", "app_unknown": "Applicazione sconosciuta", "ask_email": "Indirizzo email", "ask_password": "Password", @@ -28,13 +28,13 @@ "admin_password": "Password dell'amministrazione", "admin_password_change_failed": "Impossibile cambiare la password", "admin_password_changed": "La password dell'amministrazione è stata cambiata", - "app_install_files_invalid": "Non sono validi i file di installazione", + "app_install_files_invalid": "Questi file non possono essere installati", "app_manifest_invalid": "Manifesto dell'applicazione non valido: {error}", "app_not_correctly_installed": "{app:s} sembra di non essere installata correttamente", "app_not_properly_removed": "{app:s} non è stata correttamente rimossa", "action_invalid": "L'azione '{action:s}' non è valida", "app_removed": "{app:s} è stata rimossa", - "app_sources_fetch_failed": "Impossibile riportare i file sorgenti", + "app_sources_fetch_failed": "Impossibile riportare i file sorgenti, l'URL è corretto?", "app_upgrade_failed": "Impossibile aggiornare {app:s}", "app_upgraded": "{app:s} è stata aggiornata", "app_requirements_checking": "Controllo i pacchetti richiesti per {app}…", @@ -176,9 +176,9 @@ "app_change_url_failed_nginx_reload": "Non riesco a riavviare NGINX. Questo è il risultato di 'nginx -t':\n{nginx_errors:s}", "app_change_url_identical_domains": "Il vecchio ed il nuovo dominio/percorso_url sono identici ('{domain:s}{path:s}'), nessuna operazione necessaria.", "app_change_url_no_script": "L'applicazione '{app_name:s}' non supporta ancora la modifica dell'URL. Forse dovresti aggiornare l'applicazione.", - "app_change_url_success": "URL dell'applicazione {app:s} cambiato con successo in {domain:s}{path:s}", - "app_make_default_location_already_used": "Impostazione dell'applicazione '{app}' come predefinita del dominio {domain} non riuscita perchè è già stata impostata per l'altra applicazione '{other_app}'", - "app_location_unavailable": "Questo URL non è disponibile o va in conflitto con la/le applicazione/i già installata/e:\n{apps:s}", + "app_change_url_success": "L'URL dell'applicazione {app:s} è stato cambiato in {domain:s}{path:s}", + "app_make_default_location_already_used": "Impostazione dell'applicazione '{app}' come predefinita del dominio non riuscita perché il dominio {domain} è già in uso per l'altra applicazione '{other_app}'", + "app_location_unavailable": "Questo URL non è più disponibile o va in conflitto con la/le applicazione/i già installata/e:\n{apps:s}", "app_upgrade_app_name": "Aggiornando l'applicazione {app}…", "app_upgrade_some_app_failed": "Impossibile aggiornare alcune applicazioni", "backup_abstract_method": "Questo metodo di backup non è ancora stato implementato", @@ -212,8 +212,8 @@ "certmanager_cert_install_success": "Certificato Let's Encrypt per il dominio {domain:s} installato con successo!", "aborting": "Annullamento.", "admin_password_too_long": "Per favore scegli una password più corta di 127 caratteri", - "app_not_upgraded": "Le seguenti app non sono state aggiornate: {apps}", - "app_start_install": "Installando l'applicazione {app}…", + "app_not_upgraded": "Impossibile aggiornare le applicazioni '{failed app}' e di conseguenza l'aggiornamento delle seguenti applicazione è stato cancellato: {apps}", + "app_start_install": "Installando l'applicazione '{app}'…", "app_start_remove": "Rimuovendo l'applicazione {app}…", "app_start_backup": "Raccogliendo file da salvare nel backup per {app}…", "app_start_restore": "Ripristinando l'applicazione {app}…", @@ -335,5 +335,9 @@ "migration_0003_not_jessie": "La distribuzione attuale non è Jessie!", "migration_0003_system_not_fully_up_to_date": "Il tuo sistema non è completamente aggiornato. Per favore prima esegui un aggiornamento normale prima di migrare a stretch.", "this_action_broke_dpkg": "Questa azione ha danneggiato dpkg/apt (i gestori di pacchetti del sistema)… Puoi provare a risolvere questo problema connettendoti via SSH ed eseguendo `sudo dpkg --configure -a`.", - "app_action_broke_system": "Questa azione sembra avere rotto questi servizi importanti: {services}" + "app_action_broke_system": "Questa azione sembra avere rotto questi servizi importanti: {services}", + "app_remove_after_failed_install": "Rimozione dell'applicazione a causa del fallimento dell'installazione…", + "app_install_script_failed": "Si è verificato un errore nello script di installazione dell'applicazione", + "app_install_failed": "Impossibile installare {app}:{error}", + "app_full_domain_unavailable": "Spiacente, questa app deve essere installata su un proprio dominio, ma altre applicazioni sono state installate sul dominio '{domain}'. Dovresti invece usare un sotto-dominio dedicato per questa app." } From a08aff8bf57d996717db6e3052535dd21ef1b31f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quent=C3=AD?= Date: Mon, 25 May 2020 19:42:10 +0000 Subject: [PATCH 16/20] Translated using Weblate (Occitan) Currently translated at 58.3% (373 of 640 strings) Translation: YunoHost/core Translate-URL: https://translate.yunohost.org/projects/yunohost/core/oc/ --- locales/oc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/oc.json b/locales/oc.json index 13572a1b1..90be0b561 100644 --- a/locales/oc.json +++ b/locales/oc.json @@ -472,7 +472,7 @@ "migrations_not_pending_cant_skip": "Aquestas migracions son pas en espèra, las podètz pas doncas ignorar : {ids}", "app_action_broke_system": "Aquesta accion sembla aver copat de servicis importants : {services}", "diagnosis_display_tip_web": "Podètz anar a la seccion Diagnostic (dins l’ecran d’acuèlh) per veire los problèmas trobats.", - "diagnosis_ip_no_ipv6": "Lo servidor a pas d’adreça IPv5 activa.", + "diagnosis_ip_no_ipv6": "Lo servidor a pas d’adreça IPv6 activa.", "diagnosis_ip_not_connected_at_all": "Lo servidor sembla pas connectat a Internet ?!", "diagnosis_security_all_good": "Cap de vulnerabilitat de seguretat critica pas trobada.", "diagnosis_description_regenconf": "Configuracion sistèma", @@ -537,7 +537,7 @@ "group_cannot_be_deleted": "Lo grop « {group} » pòt pas èsser suprimit manualament.", "diagnosis_found_warnings": "Trobat {warnings} element(s) que se poirián melhorar per {category}.", "diagnosis_dns_missing_record": "Segon la configuracion DNS recomandada, vos calriá ajustar un enregistrament DNS\ntipe: {type}\nnom: {name}\nvalor: {value}", - "diagnosis_dns_discrepancy": "Segon la configuracion DNS recomandada, la valor per l’enregistrament DNS\ntipe: {type}\nnom: {name}\ndeuriá èsser: {current}\nallòc de: {value}", + "diagnosis_dns_discrepancy": "La configuracion DNS seguenta sembla pas la configuracion recomandada :
Tipe : {type}
Nom : {name}
Valors actualas : {current]
Valor esperada : {value}", "diagnosis_regenconf_manually_modified_debian_details": "Es pas problematic, mas car téner d’agacher...", "diagnosis_ports_could_not_diagnose": "Impossible de diagnosticar se los pòrts son accessibles de l’exterior.", "diagnosis_ports_could_not_diagnose_details": "Error : {error}", From e1c945d350f06138093f31485358753658142d82 Mon Sep 17 00:00:00 2001 From: xaloc33 Date: Sat, 30 May 2020 11:37:23 +0000 Subject: [PATCH 17/20] Translated using Weblate (Catalan) Currently translated at 100.0% (641 of 641 strings) Translation: YunoHost/core Translate-URL: https://translate.yunohost.org/projects/yunohost/core/ca/ --- locales/ca.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/ca.json b/locales/ca.json index 8426ccf1e..f6802f216 100644 --- a/locales/ca.json +++ b/locales/ca.json @@ -650,5 +650,6 @@ "diagnosis_domain_expires_in": "{domain} expirarà en {days} dies.", "diagnosis_swap_tip": "Vigileu i tingueu en compte que els servidor està allotjant memòria d'intercanvi en una targeta SD o en l'emmagatzematge SSD, això pot reduir dràsticament l'esperança de vida del dispositiu.", "restore_already_installed_apps": "No s'han pogut restaurar les següents aplicacions perquè ja estan instal·lades: {apps}", - "app_packaging_format_not_supported": "No es pot instal·lar aquesta aplicació ja que el format del paquet no és compatible amb la versió de YunoHost del sistema. Hauríeu de considerar actualitzar el sistema." + "app_packaging_format_not_supported": "No es pot instal·lar aquesta aplicació ja que el format del paquet no és compatible amb la versió de YunoHost del sistema. Hauríeu de considerar actualitzar el sistema.", + "diagnosis_dns_try_dyndns_update_force": "La configuració DNS d'aquest domini hauria de ser gestionada automàticament per YunoHost. Si aquest no és el cas, podeu intentar forçar-ne l'actualització utilitzant yunohost dyndns update --force." } From 0566ee49e3b5cd57bdad1caa35e7bbc439ab039f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Jun 2020 01:23:53 +0200 Subject: [PATCH 18/20] Typo --- locales/it.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/it.json b/locales/it.json index cbb4bf5c3..19884b5bb 100644 --- a/locales/it.json +++ b/locales/it.json @@ -212,7 +212,7 @@ "certmanager_cert_install_success": "Certificato Let's Encrypt per il dominio {domain:s} installato con successo!", "aborting": "Annullamento.", "admin_password_too_long": "Per favore scegli una password più corta di 127 caratteri", - "app_not_upgraded": "Impossibile aggiornare le applicazioni '{failed app}' e di conseguenza l'aggiornamento delle seguenti applicazione è stato cancellato: {apps}", + "app_not_upgraded": "Impossibile aggiornare le applicazioni '{failed_app}' e di conseguenza l'aggiornamento delle seguenti applicazione è stato cancellato: {apps}", "app_start_install": "Installando l'applicazione '{app}'…", "app_start_remove": "Rimuovendo l'applicazione {app}…", "app_start_backup": "Raccogliendo file da salvare nel backup per {app}…", From f0e204bcd37859a58d7df26bb57e933972b01d4d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 4 Jun 2020 01:45:18 +0200 Subject: [PATCH 19/20] Change to be consistent with mysql helper --- data/helpers.d/postgresql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/helpers.d/postgresql b/data/helpers.d/postgresql index cce1f7959..284c02d3e 100644 --- a/data/helpers.d/postgresql +++ b/data/helpers.d/postgresql @@ -213,7 +213,7 @@ ynh_psql_drop_user() { # usage: ynh_psql_setup_db --db_user=user --db_name=name [--db_pwd=pwd] # | arg: -u, --db_user= - Owner of the database # | arg: -n, --db_name= - Name of the database -# | arg: -p, --db_pwd= - Password of the database. If not given, a password will be generated +# | arg: -p, --db_pwd= - Password of the database. If not provided, a password will be generated # # After executing this helper, the password of the created database will be available in $db_pwd # It will also be stored as "psqlpwd" into the app settings. @@ -231,7 +231,7 @@ ynh_psql_setup_db() { if ! ynh_psql_user_exists --user=$db_user; then local new_db_pwd=$(ynh_string_random) # Generate a random password - # If $db_pwd is not given, use new_db_pwd instead for db_pwd + # If $db_pwd is not provided, use new_db_pwd instead for db_pwd db_pwd="${db_pwd:-$new_db_pwd}" ynh_psql_create_user "$db_user" "$db_pwd" From a025809e7e2ac4296783580cdad8f47f1f80032e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 4 Jun 2020 02:33:34 +0200 Subject: [PATCH 20/20] Update changelog for 3.8.4.7 --- debian/changelog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2916f1b8f..5abadb3f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +yunohost (3.8.4.7) stable; urgency=low + + - [fix] Remove some remains of glances (17eec25e) + - [fix] Force external resolution for reverse DNS dig (852cd14c) + - [fix] Make sure mysql is an alias to mariadb (e24191ce, ca89607d) + - [fix] Path for ynh_add_fpm_config template in restore (#1001) + - [fix] Add -o Acquire::Retries=3 to fix some stupid network issues happening sometimes with apt (03432349) + - [fix] ynh_setup_source: Retry wget on non-critical failures to try to avoid tmp dns issues (3d66eaec) + - [fix] ynh_setup_source: Calling ynh_print_err in case of error didn't work, and we probably want a ynh_die here (55036fad) + - [i18n] Translations updated for Catalan, French, Italian, Occitan + + Thanks to all contributors <3 ! (JimboJoe, Leandro N., ppr, Quentí, xaloc33, yalh76) + + -- Alexandre Aubin Thu, 04 Jun 2020 02:28:33 +0200 + yunohost (3.8.4.6) stable; urgency=low - [fix] Bump server_names_hash_bucket_size to 128 to avoid nginx exploding for stupid reasons (b3db4d92)