From 464937d8fc2ebc6c8dd9ccaddd3ed931f5e2dd14 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 Jan 2022 22:08:28 +0100 Subject: [PATCH 1/8] Apply Lest example_ynh --- .travis.yml | 7 ----- check_process | 4 +-- conf/config.php | 2 +- conf/nginx.conf | 5 ---- doc/.gitkeep | 0 doc/DESCRIPTION.md | 1 + doc/DISCLAIMER.md | 0 doc/screenshots/.gitkeep | 0 manifest.json | 13 ++++++--- scripts/backup | 12 ++++---- scripts/install | 36 ++++++++++++++---------- scripts/remove | 34 +++++++++++++++-------- scripts/restore | 37 +++++++++++++------------ scripts/upgrade | 59 ++++++++++++++++++++-------------------- 14 files changed, 111 insertions(+), 99 deletions(-) delete mode 100644 .travis.yml create mode 100644 doc/.gitkeep create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DISCLAIMER.md create mode 100644 doc/screenshots/.gitkeep diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6133a24..0000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -language: python - -before_install: - - git clone https://github.com/YunoHost/package_linter /tmp/package_linter - -script: -- /tmp/package_linter/package_linter.py ./ \ No newline at end of file diff --git a/check_process b/check_process index e23c831..57664ca 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/Microsoft-Server-ActiveSync" (PATH) + domain="domain.tld" + path="/Microsoft-Server-ActiveSync" ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/conf/config.php b/conf/config.php index b7b456d..14cabe9 100644 --- a/conf/config.php +++ b/conf/config.php @@ -65,7 +65,7 @@ * State migration script is available, more informations: https://wiki.z-hub.io/x/xIAa */ define('STATE_MACHINE', 'FILE'); - define('STATE_DIR', '__STATEDIR__/'); + define('STATE_DIR', '__DATADIR__/'); /********************************************************************************** * IPC - InterProcessCommunication diff --git a/conf/nginx.conf b/conf/nginx.conf index 41cf3a2..764a13a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,11 +4,6 @@ location /Microsoft-Server-ActiveSync/ { # Path to source alias __FINALPATH__/ ; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file diff --git a/doc/.gitkeep b/doc/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..0947fa2 --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +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) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..e69de29 diff --git a/doc/screenshots/.gitkeep b/doc/screenshots/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/manifest.json b/manifest.json index cf7a981..6e81540 100644 --- a/manifest.json +++ b/manifest.json @@ -8,6 +8,12 @@ }, "version": "2.6.1~ynh3", "url": "https://z-push.org", + "upstream": { + "license": "AGPL-3.0-or-later", + "website": "http://z-push.org", + "admindoc": "https://wiki.z-hub.io/display/ZP/Documentation", + "code": "https://github.com/Z-Hub/Z-Push" + }, "license": "AGPL-3.0-or-later", "maintainer": { "name": "yalh76" @@ -21,7 +27,7 @@ } ], "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ @@ -29,11 +35,10 @@ "php7.3-fpm" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" } ] } diff --git a/scripts/backup b/scripts/backup index 8112f3a..bfb8587 100755 --- a/scripts/backup +++ b/scripts/backup @@ -29,9 +29,9 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) -statedir=$(ynh_app_setting_get --app=$app --key=statedir) -final_logpath=$(ynh_app_setting_get --app=$app --key=final_logpath) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) +final_logpath=$(ynh_app_setting_get --app=$app --key=final_logpath) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP @@ -44,11 +44,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" -# Backup statedir -ynh_backup --src_path="$statedir" --is_big +#================================================= +# BACKUP THE DATA DIR +#================================================= -# Backup logs -ynh_backup --src_path="$final_logpath" --is_big +ynh_backup --src_path="$datadir" --is_big #================================================= # BACKUP THE NGINX CONFIGURATION diff --git a/scripts/install b/scripts/install index 9fbdaae..7447786 100755 --- a/scripts/install +++ b/scripts/install @@ -36,11 +36,6 @@ ynh_script_progression --message="Validating installation parameters..." final_path=/var/www/$app test ! -e "$final_path" || ynh_die --message="This path already contains a folder" -statedir="/home/yunohost.app/$app" -test ! -e "$statedir" || ynh_die --message="This path already contains a folder" - -final_logpath="/var/log/$app" - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -51,8 +46,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=statedir --value=$statedir -ynh_app_setting_set --app=$app --key=final_logpath --value=$final_logpath #================================================= # STANDARD MODIFICATIONS @@ -69,7 +62,7 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Configuring system user..." # Create a system user -ynh_system_user_create --username=$app --home_dir="$final_path" +ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -107,16 +100,29 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # SPECIFIC SETUP #================================================= -# CREATE STATEDIR AND FINAL_LOGPATH +# CREATE DATA DIRECTORY #================================================= -ynh_script_progression --message="Creating statedir and final_logpath..." +ynh_script_progression --message="Creating a data directory..." -mkdir -p $statedir -chmod 750 "$statedir" -chmod -R o-rwx "$statedir" -chown -R $app:www-data "$statedir" +datadir=/home/yunohost.app/$app +ynh_app_setting_set --app=$app --key=datadir --value=$datadir + +mkdir -p $datadir + +chmod 750 "$datadir" +chmod -R o-rwx "$datadir" +chown -R $app:www-data "$datadir" + +#================================================= +# CREATE FINAL LOG PATH +#================================================= +ynh_script_progression --message="Creating a final log path..." + +final_logpath="/var/log/$app" +ynh_app_setting_set --app=$app --key=final_logpath --value=$final_logpath mkdir -p $final_logpath + chmod 750 "$final_logpath" chmod -R o-rwx "$final_logpath" chown -R $app:www-data "$final_logpath" @@ -134,7 +140,7 @@ ynh_replace_string --match_string="__FINAL_LOGPATH__" --replace_string=$final_lo # Storage of state_dir in /home/yunohost.app # This contains the sync status in between device and z-push -ynh_replace_string --match_string="__STATEDIR__" --replace_string=$statedir --target_file="../conf/config.php" +ynh_replace_string --match_string="__DATADIR__" --replace_string=$datadir --target_file="../conf/config.php" # Enable caldav carddav support if yunohost app list | grep -q 'id: baikal' ; then diff --git a/scripts/remove b/scripts/remove index 9fd996e..e8dcf2a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,18 +18,18 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -statedir=$(ynh_app_setting_get --app=$app --key=statedir) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) final_logpath=$(ynh_app_setting_get --app=$app --key=final_logpath) #================================================= # STANDARD REMOVE #================================================= -# REMOVE DEPENDENCIES +# REMOVE LOGROTATE CONFIGURATION #================================================= -ynh_script_progression --message="Removing dependencies..." +ynh_script_progression --message="Removing logrotate configuration..." -# Remove metapackage and its dependencies -ynh_remove_app_dependencies +# Remove the app-specific logrotate config +ynh_remove_logrotate #================================================= # REMOVE APP MAIN DIR @@ -39,6 +39,17 @@ ynh_script_progression --message="Removing app main directory..." # Remove the app directory securely ynh_secure_remove --file="$final_path" +#================================================= +# REMOVE DATA DIR +#================================================= + +# Remove the data directory if --purge option is used +if [ "${YNH_APP_PURGE:-0}" -eq 1 ] +then + ynh_script_progression --message="Removing app data directory..." + ynh_secure_remove --file="$datadir" +fi + #================================================= # REMOVE NGINX CONFIGURATION #================================================= @@ -56,21 +67,20 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." ynh_remove_fpm_config #================================================= -# REMOVE LOGROTATE CONFIGURATION +# REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing logrotate configuration..." +ynh_script_progression --message="Removing dependencies..." -# Remove the app-specific logrotate config -ynh_remove_logrotate +# Remove metapackage and its dependencies +ynh_remove_app_dependencies #================================================= # SPECIFIC REMOVE #================================================= -# REMOVE STATEDIR AND FINAL_LOGPATH +# REMOVE VARIOUS FILES #================================================= -ynh_script_progression --message="Removing statedir and final_logpath..." +ynh_script_progression --message="Removing various files..." -ynh_secure_remove --file="$statedir" ynh_secure_remove --file="$final_logpath" #================================================= diff --git a/scripts/restore b/scripts/restore index b23b13e..e7f0c49 100755 --- a/scripts/restore +++ b/scripts/restore @@ -30,17 +30,15 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -statedir=$(ynh_app_setting_get --app=$app --key=statedir) -final_logpath=$(ynh_app_setting_get --app=$app --key=final_logpath) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) +final_logpath=$(ynh_app_setting_get --app=$app --key=final_logpath) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= ynh_script_progression --message="Validating restoration parameters..." -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " @@ -59,7 +57,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # RESTORE THE APP MAIN DIR @@ -68,24 +66,27 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$final_path" -# Restore statedir -ynh_restore_file --origin_path="$statedir" --not_mandatory -mkdir -p $statedir -chmod 750 "$statedir" -chmod -R o-rwx "$statedir" -chown -R $app:www-data "$statedir" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" -# Restore logs, data & permissions -ynh_restore_file --origin_path="$final_logpath" --not_mandatory -mkdir -p $final_logpath -chmod 750 "$final_logpath" -chmod -R o-rwx "$final_logpath" -chown -R $app:www-data "$final_logpath" +#================================================= +# RESTORE THE DATA DIRECTORY +#================================================= +ynh_script_progression --message="Restoring the data directory..." + +ynh_restore_file --origin_path="$datadir" --not_mandatory + +mkdir -p $datadir + +chmod 750 "$datadir" +chmod -R o-rwx "$datadir" +chown -R $app:www-data "$datadir" #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring PHP-FPM configuration..." +ynh_script_progression --message="Restoring the PHP-FPM configuration..." ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 947a190..42ff8da 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,7 +19,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -statedir=$(ynh_app_setting_get --app=$app --key=statedir) +datadir=$(ynh_app_setting_get --app=$app --key=datadir) final_logpath=$(ynh_app_setting_get --app=$app --key=final_logpath) #================================================= @@ -29,32 +29,6 @@ ynh_script_progression --message="Checking version..." upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - -if [ -z "$statedir" ]; -then - statedir="/home/yunohost.app/$app" - ynh_app_setting_set --app=$app --key=statedir --value=$statedir - mkdir -p $statedir -fi - -if [ -z "$final_logpath" ]; -then - final_logpath="/var/log/$app" - ynh_app_setting_set --app=$app --key=final_logpath --value=$final_logpath - mkdir -p $final_logpath -fi - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -71,13 +45,40 @@ ynh_abort_if_errors #================================================= # STANDARD UPGRADE STEPS +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." + +if [ -z "$datadir" ]; +then + datadir="/home/yunohost.app/$app" + ynh_app_setting_set --app=$app --key=datadir --value=$datadir + ynh_app_setting_delete --app=$app --key=statedir + mkdir -p $datadir +fi + +if [ -z "$final_logpath" ]; +then + final_logpath="/var/log/$app" + ynh_app_setting_set --app=$app --key=final_logpath --value=$final_logpath + mkdir -p $final_logpath +fi + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # CREATE DEDICATED USER #================================================= ynh_script_progression --message="Making sure dedicated system user exists..." # Create a dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir="$final_path" +ynh_system_user_create --username=$app --home_dir=$final_path #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -137,7 +138,7 @@ ynh_replace_string --match_string="__FINAL_LOGPATH__" --replace_string="$final_l # Storage of state_dir in /home/yunohost.app # This contains the sync status in between device and z-push -ynh_replace_string __STATEDIR__ $statedir ../conf/config.php +ynh_replace_string __DATADIR__ $datadir ../conf/config.php # Enable caldav carddav support if yunohost app list | grep -q 'id: baikal' ; then From 34ba5b9e4cf916318e9ea4da37b4c370c7b2a0c2 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 18 Jan 2022 21:08:34 +0000 Subject: [PATCH 2/8] Auto-update README --- README.md | 33 ++++++++++++++++++--------------- README_fr.md | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 README_fr.md diff --git a/README.md b/README.md index ac349e4..9fd615a 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,34 @@ + + # Z-Push for YunoHost [![Integration level](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) [![Install Z-Push with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) -> *This package allows you to install Z-Push quickly and simply on a YunoHost server. +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Z-Push quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview + 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.6.1 -## Documentation +**Shipped version:** 2.6.1~ynh3 - * Official documentation: https://wiki.z-hub.io/display/ZP/Documentation -#### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/z-push.svg)](https://ci-apps.yunohost.org/ci/apps/z-push/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/z-push.svg)](https://ci-apps-arm.yunohost.org/ci/apps/z-push/) +## Documentation and resources -## Links - - * Report a bug: https://github.com/YunoHost-Apps/z-push_ynh/issues - * App website: http://z-push.org/ - * Upstream app repository: https://github.com/Z-Hub/Z-Push - * YunoHost website: https://yunohost.org/ - ---- +* Official app website: http://z-push.org +* Official admin documentation: https://wiki.z-hub.io/display/ZP/Documentation +* Upstream app code repository: https://github.com/Z-Hub/Z-Push +* YunoHost documentation for this app: https://yunohost.org/app_z-push +* Report a bug: https://github.com/YunoHost-Apps/z-push_ynh/issues ## Developer info @@ -39,3 +40,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/z-push_ynh/tree/testi or sudo yunohost app upgrade z-push -u https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..38a0aeb --- /dev/null +++ b/README_fr.md @@ -0,0 +1,40 @@ +# Z-Push pour YunoHost + +[![Niveau d'intégration](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) +[![Installer Z-Push avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=z-push) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer Z-Push rapidement et simplement sur un serveur YunoHost. +Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* + +## Vue d'ensemble + +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.6.1~ynh3 + + + +## Documentations et ressources + +* Site officiel de l'app : http://z-push.org +* Documentation officielle de l'admin : https://wiki.z-hub.io/display/ZP/Documentation +* Dépôt de code officiel de l'app : https://github.com/Z-Hub/Z-Push +* Documentation YunoHost pour cette app : https://yunohost.org/app_z-push +* Signaler un bug : https://github.com/YunoHost-Apps/z-push_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/z-push_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug +ou +sudo yunohost app upgrade z-push -u https://github.com/YunoHost-Apps/z-push_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file From 0e3a9b20015c5b83fbe8dc5920c21f3c6c91d8f9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 Jan 2022 22:11:35 +0100 Subject: [PATCH 3/8] upgrade to 2.6.4~ynh1 --- README.md | 2 +- check_process | 4 ++++ conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ac349e4..34fd027 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview 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.6.1 +**Shipped version:** 2.6.4 ## Documentation diff --git a/check_process b/check_process index 57664ca..e4e89e5 100644 --- a/check_process +++ b/check_process @@ -18,6 +18,8 @@ # upgrade=1 from_commit=a05896f0e4f2b015dcf643c644ac6c98c2f6695b # 2.6.1~ynh2 upgrade=1 from_commit=8e99ec37fb90d1ac4f8eb2c838e6d2e1f5b0c905 + # 2.6.1~ynh3 + upgrade=1 from_commit=f101d8cb5701c46db0d6cf5aaa02b1e7f8e0dec2 backup_restore=1 multi_instance=1 port_already_use=0 @@ -34,3 +36,5 @@ Notification=all name=2.6.1~ynh1 ; commit=8e99ec37fb90d1ac4f8eb2c838e6d2e1f5b0c905 name=2.6.1~ynh2 + ; commit=f101d8cb5701c46db0d6cf5aaa02b1e7f8e0dec2 + name=2.6.1~ynh3 diff --git a/conf/app.src b/conf/app.src index 2825efa..1ac8c2e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/2.6.1.tar.gz -SOURCE_SUM=db97e9ff2eebec01c65e1a9150524a1fb45dc4b003955fb0847fbb069f143e33 +SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/2.6.4.tar.gz +SOURCE_SUM=7795ae7165fa3fb39a6ba40ca3e79609767e0c78c01857ede0f7014b90b27431 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 6e81540..d241bbb 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActiveSync frontend that helps you synchronize emails, calendar and contacts", "fr": "Frontend ActiveSync qui permet de synchroniser emails, calendrier et contacts" }, - "version": "2.6.1~ynh3", + "version": "2.6.4~ynh1", "url": "https://z-push.org", "upstream": { "license": "AGPL-3.0-or-later", From 4b9ec3e5326500bb8d91f04d6312fd8f6f2f4203 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 18 Jan 2022 21:13:05 +0000 Subject: [PATCH 4/8] Auto-update README --- README.md | 7 ++++++- README_fr.md | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8710de7..a3a36ae 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -**Shipped version:** 2.6.4 +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.6.4~ynh1 + + ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 38a0aeb..e9524e2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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.6.1~ynh3 +**Version incluse :** 2.6.4~ynh1 From e9f231390674760572855795c32bb201cfad7d0a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 Jan 2022 22:18:42 +0100 Subject: [PATCH 5/8] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index e69de29..d490362 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -0,0 +1 @@ +* would be better to create a dedicated domain: autodiscover.yourdomain.org \ No newline at end of file From 69d2fc19c8e7f846b8973744bc9a21ebdaddfdbd Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 18 Jan 2022 22:18:51 +0100 Subject: [PATCH 6/8] Update DISCLAIMER.md --- doc/DISCLAIMER.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index d490362..c5645eb 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1 +1 @@ -* would be better to create a dedicated domain: autodiscover.yourdomain.org \ No newline at end of file +* would be better to create a dedicated domain: autodiscover.yourdomain.org From c63867c1d3c6b3aa5cf5eaa3dff72bc75d306a56 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 18 Jan 2022 21:18:56 +0000 Subject: [PATCH 7/8] Auto-update README --- README.md | 4 ++++ README_fr.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index a3a36ae..ae766ea 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,10 @@ Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchroni +## Disclaimers / important information + +* would be better to create a dedicated domain: autodiscover.yourdomain.org + ## Documentation and resources * Official app website: http://z-push.org diff --git a/README_fr.md b/README_fr.md index e9524e2..0f95ceb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,6 +18,10 @@ Z-Push is an Exchange ActiveSync fronted written in PHP which lets you synchroni +## Avertissements / informations importantes + +* would be better to create a dedicated domain: autodiscover.yourdomain.org + ## Documentations et ressources * Site officiel de l'app : http://z-push.org From 355a3773fb2017f56906885361c06951512c561e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 19 Jan 2022 19:28:58 +0100 Subject: [PATCH 8/8] Update config files --- conf/backend/config-caldav.php | 2 +- conf/backend/config-carddav.php | 7 ++++--- conf/backend/config-imap.php | 3 +++ conf/backend/config-searchldap.php | 8 +++++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/conf/backend/config-caldav.php b/conf/backend/config-caldav.php index 6499eaf..a22a863 100644 --- a/conf/backend/config-caldav.php +++ b/conf/backend/config-caldav.php @@ -38,7 +38,7 @@ define('CALDAV_SERVER', '__CALDAV_SERVER__'); // Server port define('CALDAV_PORT', '443'); -// Path +// Base URL to principals calendar collection: use '%l' for local part or '%u' for full username define('CALDAV_PATH', '__CALDAV_PATH__'); // Default CalDAV folder (calendar folder/principal). This will be marked as the default calendar in the mobile diff --git a/conf/backend/config-carddav.php b/conf/backend/config-carddav.php index 3020359..7a3f2fe 100644 --- a/conf/backend/config-carddav.php +++ b/conf/backend/config-carddav.php @@ -42,6 +42,7 @@ define('CARDDAV_PORT', '443'); // http://localhost/caldav.php/test@domain.com/addresses/personal // http://localhost/caldav.php/test@domain.com/addresses/work // You set the CARDDAV_PATH to '/caldav.php/%u/addresses/' and personal and work will be autodiscovered +// %l: replaced with the local part of the username // %u: replaced with the username // %d: replaced with the domain // Add the trailing / @@ -50,6 +51,7 @@ define('CARDDAV_PATH', '__CARDDAV_PATH__'); // Server path to the default addressbook // Mobile device will create new contacts here. It must be under CARDDAV_PATH +// %l: replaced with the local part of the username // %u: replaced with the username // %d: replaced with the domain // Add the trailing / @@ -57,18 +59,17 @@ define('CARDDAV_DEFAULT_PATH', '__CARDDAV_DEFAULT_PATH__'); // Server path to the GAL addressbook. This addressbook is readonly and searchable by the user, but it will NOT be synced. // If you don't want GAL, comment it +// %l: replaced with the local part of the username // %u: replaced with the username // %d: replaced with the domain // Add the trailing / - //define('CARDDAV_GAL_PATH', '/caldav.php/%d/GAL/'); - // Minimal length for the search pattern to do the real search. - //define('CARDDAV_GAL_MIN_LENGTH', 5); // Addressbook display name, the name showed in the mobile device +// %l: replaced with the local part of the username // %u: replaced with the username // %d: replaced with the domain define('CARDDAV_CONTACTS_FOLDER_NAME', '%u Addressbook'); diff --git a/conf/backend/config-imap.php b/conf/backend/config-imap.php index ab9e2a3..e48d50b 100644 --- a/conf/backend/config-imap.php +++ b/conf/backend/config-imap.php @@ -223,3 +223,6 @@ define('IMAP_MEETING_USE_CALDAV', __FLAGTOCHANGE__); // methods and you will be unable to log in. Uncomment the following line to disable that authentication method. // Multiple methods can be specified as a comma-separated string. // define('IMAP_DISABLE_AUTHENTICATOR', 'GSSAPI'); + +// Specify Which Charset the IMAP Search is going to use, Default is 'UTF-8' but you could use 'US-ASCII' +define('IMAP_SEARCH_CHARSET', 'UTF-8'); diff --git a/conf/backend/config-searchldap.php b/conf/backend/config-searchldap.php index a0d36b6..ca849d8 100644 --- a/conf/backend/config-searchldap.php +++ b/conf/backend/config-searchldap.php @@ -24,9 +24,8 @@ * Consult LICENSE file for details ************************************************/ -// LDAP host and port -define("LDAP_HOST", "ldap://127.0.0.1/"); -define("LDAP_PORT", "389"); +// LDAP server uri +define("LDAP_SERVER_URI", "ldap://127.0.0.1:389/"); // Set USER and PASSWORD if not using anonymous bind define("ANONYMOUS_BIND", true); @@ -54,3 +53,6 @@ $ldap_field_map = array( SYNC_GAL_MOBILEPHONE => 'mobile', SYNC_GAL_EMAILADDRESS => 'mail', ); + +// Fallback to displayname if firstname and lastname not set +define("LDAP_SEARCH_NAME_FALLBACK", false);