From 731cc9c82d9fb472a5898e1a39603177880b5dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 May 2024 21:19:10 +0200 Subject: [PATCH 1/2] fix --- scripts/backup | 18 +----------------- scripts/upgrade | 24 +++++++----------------- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/scripts/backup b/scripts/backup index 572b62f..1c91c7d 100644 --- a/scripts/backup +++ b/scripts/backup @@ -26,34 +26,18 @@ trap '(cd $install_dir && ynh_exec_as $app php$phpversion bin/console.php mainte 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 THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP FAIL2BAN CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" -#================================================= -# BACKUP LOGROTATE -#================================================= - ynh_backup --src_path="/etc/logrotate.d/$app" -#================================================= -# BACKUP VARIOUS FILES -#================================================= - ynh_backup --src_path="/var/log/$app" ynh_backup --src_path="/etc/systemd/system/$app-daemon.service" diff --git a/scripts/upgrade b/scripts/upgrade index c466471..cda53dd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STOP SYSTEMD SERVICE #================================================= @@ -25,18 +19,11 @@ ynh_systemd_action --service_name="$app-daemon" --action="stop" --log_path="/var #================================================= # 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" --keep="config/local.config.php" - ynh_setup_source --dest_dir="$install_dir/addon" --source_id="addons" -fi - -chmod -R o-rwx "$install_dir" -chown -R "$app:www-data" "$install_dir" +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep="config/local.config.php" +ynh_setup_source --dest_dir="$install_dir/addon" --source_id="addons" # clear the smarty cache # cf: https://github.com/friendica/friendica/issues/11212#issuecomment-1046051750 @@ -44,6 +31,9 @@ ynh_secure_remove --file="$install_dir/view/smarty3/compiled" mkdir "$install_dir/view/smarty3/compiled" chmod -R 775 "$install_dir/view/smarty3" +chmod -R o-rwx "$install_dir" +chown -R "$app:www-data" "$install_dir" + #================================================= # REAPPLY SYSTEM CONFIGURATIONS #================================================= From b13ecfe3e92c57d981b70c7f35be8eab7ad7a382 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 13 May 2024 19:19:15 +0000 Subject: [PATCH 2/2] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 52 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..8938aae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Lee el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..f8996c1 --- /dev/null +++ b/README_es.md @@ -0,0 +1,52 @@ + + +# Friendica para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg) + +[![Instalar Friendica con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=friendica) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarFriendica rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +Friendica is a decentralised communications platform that integrates social communication. The platform links to independent social projects and corporate services. +Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on Friendica, Mastodon, Diaspora, GnuSocial, Pleroma, or Hubzilla, regardless where each user profile is hosted. + + +**Versión actual:** 2024.03~ynh1 + +**Demo:** + +## Capturas + +![Captura de Friendica](./doc/screenshots/friendica-vier-profile.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación usuario oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/friendica_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug +o +sudo yunohost app upgrade friendica -u https://github.com/YunoHost-Apps/friendica_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a487b3f..397ed5c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Friendica +# YunoHost 上的 Friendica [![集成程度](https://dash.yunohost.org/integration/friendica.svg)](https://dash.yunohost.org/appci/app/friendica) ![工作状态](https://ci-apps.yunohost.org/ci/badges/friendica.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/friendica.maintain.svg)