From fc1b1a5b70ab97d3b5271e92b9f479c85b7006ae Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 9 Aug 2024 03:46:50 +0200 Subject: [PATCH 1/5] Upgrade sources - `main` v2.7.4: https://github.com/Z-Hub/Z-Push/releases/tag/2.7.4 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f1ff893..737ad51 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Z-Push" description.en = "ActiveSync frontend that helps you synchronize emails, calendar and contacts" description.fr = "Frontend ActiveSync qui permet de synchroniser emails, calendrier et contacts" -version = "2.7.3~ynh1" +version = "2.7.4~ynh1" maintainers = ["yalh76"] @@ -35,8 +35,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/Z-Hub/Z-Push/archive/refs/tags/2.7.3.tar.gz" - sha256 = "89a052dd585b2858c499bea2514ce360f510a6ede469216f4498c050d7a420fa" + url = "https://github.com/Z-Hub/Z-Push/archive/refs/tags/2.7.4.tar.gz" + sha256 = "cba777846dae95993b0d90007a606d4a5f39d605ac4ab2cd0a432171eb355d48" autoupdate.strategy = "latest_github_release" [resources.system_user] From 5796a52e5ef93f4b340ca620485461ec1458a9b2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 9 Aug 2024 01:46:51 +0000 Subject: [PATCH 2/5] Auto-update READMEs --- ALL_README.md | 1 + README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_id.md | 43 +++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 4 ++-- 8 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 README_id.md diff --git a/ALL_README.md b/ALL_README.md index 152f2e7..4ed64dd 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -5,4 +5,5 @@ - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) +- [Baca README dalam bahasa bahasa Indonesia](README_id.md) - [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 7658fc9..619db2b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Z-Push for YunoHost -[![Integration level](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![Working status](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![Working status](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) [![Install Z-Push with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) -**Shipped version:** 2.7.3~ynh1 +**Shipped version:** 2.7.4~ynh1 ## Documentation and resources - Official app website: diff --git a/README_es.md b/README_es.md index 45ea3d2..94248b9 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Z-Push para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) [![Instalar Z-Push con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) @@ -19,7 +19,7 @@ No se debe editar a mano. Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) -**Versión actual:** 2.7.3~ynh1 +**Versión actual:** 2.7.4~ynh1 ## Documentaciones y recursos - Sitio web oficial: diff --git a/README_eu.md b/README_eu.md index 497e3c4..f0e6dd5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Z-Push YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) [![Instalatu Z-Push YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) @@ -19,7 +19,7 @@ EZ editatu eskuz. Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) -**Paketatutako bertsioa:** 2.7.3~ynh1 +**Paketatutako bertsioa:** 2.7.4~ynh1 ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: diff --git a/README_fr.md b/README_fr.md index e553dbe..fa1570b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Z-Push pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) [![Installer Z-Push avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) -**Version incluse :** 2.7.3~ynh1 +**Version incluse :** 2.7.4~ynh1 ## Documentations et ressources - Site officiel de l’app : diff --git a/README_gl.md b/README_gl.md index 3378a16..30cdb46 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Z-Push para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) [![Instalar Z-Push con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) @@ -19,7 +19,7 @@ NON debe editarse manualmente. Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) -**Versión proporcionada:** 2.7.3~ynh1 +**Versión proporcionada:** 2.7.4~ynh1 ## Documentación e recursos - Web oficial da app: diff --git a/README_id.md b/README_id.md new file mode 100644 index 0000000..e74375a --- /dev/null +++ b/README_id.md @@ -0,0 +1,43 @@ + + +# Z-Push untuk YunoHost + +[![Tingkat integrasi](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) + +[![Pasang Z-Push dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) + +*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)* + +> *Paket ini memperbolehkan Anda untuk memasang Z-Push secara cepat dan mudah pada server YunoHost.* +> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.* + +## Ringkasan + +Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) + + +**Versi terkirim:** 2.7.4~ynh1 +## Dokumentasi dan sumber daya + +- Website aplikasi resmi: +- Dokumentasi admin resmi: +- Depot kode aplikasi hulu: +- Gudang YunoHost: +- Laporkan bug: + +## Info developer + +Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/z-push_ynh/tree/testing). + +Untuk mencoba branch `testing`, silakan dilanjutkan seperti: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug +atau +sudo yunohost app upgrade z-push -u https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug +``` + +**Info lebih lanjut mengenai pemaketan aplikasi:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index b47e485..7dc1a06 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Z-Push -[![集成程度](https://dash.yunohost.org/integration/z-push.svg)](https://dash.yunohost.org/appci/app/z-push) ![工作状态](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/z-push.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/z-push.maintain.svg) [![使用 YunoHost 安装 Z-Push](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) @@ -19,7 +19,7 @@ Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchronize emails (IMAP/SMTP backend) and calendar/contacts (cardDAV and caldDAV backend) -**分发版本：** 2.7.3~ynh1 +**分发版本：** 2.7.4~ynh1 ## 文档与资源 - 官方应用网站： From 2593778a5a299df5a40adcbad5df4a59cb3b5e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:16:54 +0200 Subject: [PATCH 3/5] cleaning --- manifest.toml | 25 +++++++++++-------------- scripts/backup | 12 +----------- scripts/install | 10 ++++------ scripts/remove | 2 -- scripts/restore | 10 ++++------ scripts/upgrade | 9 ++++----- 6 files changed, 24 insertions(+), 44 deletions(-) diff --git a/manifest.toml b/manifest.toml index 737ad51..7c032ed 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ admindoc = "https://wiki.z-hub.io/display/ZP/Documentation" code = "https://github.com/Z-Hub/Z-Push" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.20" architectures = "all" multi_instance = true @@ -47,21 +47,18 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - main.allowed = "visitors" # should it always be public ? - - # FIXME: watdo with this ... - #REMOVEME? ynh_permission_create --permission="autodiscover" --url="re:$domain_regex/[Aa]uto[Dd]iscover/.*" --allowed="visitors" --show_tile="false" --protected="true" + main.allowed = "visitors" [resources.apt] packages = [ - "php7.4-soap", - "php7.4-imap", - "php7.4-xsl", - "php7.4-curl", - "php7.4-xml", - "php7.4-ldap", - "php7.4-cli", - "php7.4-mbstring", - "php7.4-memcached", + "php8.3-soap", + "php8.3-imap", + "php8.3-xsl", + "php8.3-curl", + "php8.3-xml", + "php8.3-ldap", + "php8.3-cli", + "php8.3-mbstring", + "php8.3-memcached", "libawl-php", ] diff --git a/scripts/backup b/scripts/backup index b0b2b76..b7bf856 100755 --- a/scripts/backup +++ b/scripts/backup @@ -28,23 +28,13 @@ ynh_backup --src_path="$install_dir" ynh_backup --src_path="$data_dir" --is_big #================================================= -# 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" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - ynh_backup --src_path="/etc/logrotate.d/$app" #================================================= diff --git a/scripts/install b/scripts/install index 8ae9a48..3fc9fd3 100755 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,6 @@ source /usr/share/yunohost/helpers path="/Microsoft-Server-ActiveSync" timezone="$(cat /etc/timezone)" -log_dir="/var/log/$app/" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -42,10 +41,10 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -mkdir -p $log_dir -chmod 750 "$log_dir" -chmod -R o-rwx "$log_dir" -chown -R $app:www-data "$log_dir" +mkdir -p "/var/log/$app/" +chmod 750 "/var/log/$app/" +chmod -R o-rwx "/var/log/$app/" +chown -R $app:www-data "/var/log/$app/" ynh_use_logrotate @@ -119,7 +118,6 @@ ynh_add_config --template="backend/config-searchldap.php" --destination="$instal #Copy XMLElement.php ln -s /usr/share/awl/inc/XML* /var/www/$app/include/ - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index 6822235..1387cb0 100755 --- a/scripts/remove +++ b/scripts/remove @@ -25,8 +25,6 @@ ynh_remove_nginx_config # Remove the dedicated PHP-FPM config ynh_remove_fpm_config -ynh_secure_remove --file="$log_dir" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 6e26b08..9982843 100755 --- a/scripts/restore +++ b/scripts/restore @@ -10,8 +10,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -log_dir="/var/log/$app/" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -42,10 +40,10 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/logrotate.d/$app" -mkdir -p $log_dir -chmod 750 "$log_dir" -chmod -R o-rwx "$log_dir" -chown -R $app:www-data "$log_dir" +mkdir -p "/var/log/$app/" +chmod 750 "/var/log/$app/" +chmod -R o-rwx "/var/log/$app/" +chown -R $app:www-data "/var/log/$app/" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 1de9596..e33c549 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) timezone="$(cat /etc/timezone)" -log_dir="/var/log/$app/" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -67,10 +66,10 @@ ynh_add_fpm_config # Create a dedicated NGINX config ynh_add_nginx_config -mkdir -p $log_dir -chmod 750 "$log_dir" -chmod -R o-rwx "$log_dir" -chown -R $app:www-data "$log_dir" +mkdir -p "/var/log/$app/" +chmod 750 "/var/log/$app/" +chmod -R o-rwx "/var/log/$app/" +chown -R $app:www-data "/var/log/$app/" ynh_use_logrotate --non-append From a5f963ae703a1bec897935cfed5fdbd726e76360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Aug 2024 10:05:07 +0200 Subject: [PATCH 4/5] Update config.php --- conf/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.php b/conf/config.php index 19154b0..389ae9d 100644 --- a/conf/config.php +++ b/conf/config.php @@ -120,7 +120,7 @@ $specialLogUsers = array(); // Filelog settings - define('LOGFILEDIR', '__LOG_DIR__'); + define('LOGFILEDIR', '/var/log/__APP__/'); define('LOGFILE', LOGFILEDIR . 'z-push.log'); define('LOGERRORFILE', LOGFILEDIR . 'z-push-error.log'); From b50e79b9b174b0663b0d1ff35db8f56842447cb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 11 Aug 2024 14:05:52 +0200 Subject: [PATCH 5/5] fix --- conf/backend/config-autodiscover.php | 2 +- scripts/upgrade | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/conf/backend/config-autodiscover.php b/conf/backend/config-autodiscover.php index 6930b36..1ba3cc7 100644 --- a/conf/backend/config-autodiscover.php +++ b/conf/backend/config-autodiscover.php @@ -87,7 +87,7 @@ define('LOGBACKEND', 'filelog'); - define('LOGFILEDIR', '__LOG_DIR__/'); + define('LOGFILEDIR', '/var/log/__APP__/'); define('LOGFILE', LOGFILEDIR . 'autodiscover.log'); define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log'); define('LOGLEVEL', LOGLEVEL_ERROR); diff --git a/scripts/upgrade b/scripts/upgrade index e33c549..443c50c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -13,16 +13,11 @@ source /usr/share/yunohost/helpers # CHECK VERSION #================================================= -upgrade_type=$(ynh_check_app_version_changed) - timezone="$(cat /etc/timezone)" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= - -if [ "$upgrade_type" == "UPGRADE_APP" ] -then ynh_script_progression --message="Upgrading source files..." mkdir "$install_dir/bkp" @@ -50,7 +45,6 @@ then fi done ynh_secure_remove --file="$install_dir/bkp" -fi chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"