From 12815c058c8781da48c1fac9f1be9270944f036f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 27 Jun 2022 13:39:55 +0200 Subject: [PATCH] testing (#144) * Update config.inc.php (#122) * Update manifest.json * Auto-update README * 1.5.1 (#124) * 1.5.1 * Add config panel (#128) * Plugin upgrade (#127) * Update plugins * Update config.inc.php * Update manifest.json * Auto-update README * Update remove * Update check_process * Update upgrade * 1.5.2 (#131) * 1.5.2 * Update config.inc.php (#134) * Fix plugins urls (#137) * fix plugins urls sblaisot/automatic_addressbook is abandonned and forked at projectmyst/automatic_addressbook * fix plugins urls as in previous commit * fix html5 plugin url * fix html5 plugin url * Auto-update README * Auto-update README * 1.5.3 (#142) * 1.5.3 * Auto-update README Co-authored-by: yunohost-bot * user * Update _common.sh * Update _common.sh Co-authored-by: Yunohost-Bot <> Co-authored-by: Xavier Brochard Co-authored-by: yunohost-bot --- README.md | 27 ++++++++++++++------------- README_fr.md | 35 ++++++++++++++++++++--------------- conf/app.src | 4 ++-- conf/config.inc.php | 1 + doc/DESCRIPTION.md | 4 ++-- doc/DESCRIPTION_fr.md | 6 +++--- doc/DISCLAIMER.md | 2 +- doc/DISCLAIMER_fr.md | 2 +- manifest.json | 2 +- scripts/_common.sh | 6 +++--- scripts/install | 4 ++-- scripts/remove | 3 ++- scripts/restore | 4 ++-- 13 files changed, 54 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index f05374e..9fac1cd 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Roundcube for YunoHost -[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) ![Working status](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg) [![Install Roundcube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=roundcube) *[Lire ce readme en français.](./README_fr.md)* @@ -22,18 +22,18 @@ Roundcube is a browser-based multilingual IMAP client with an application-like u In addition to Roundcube core features, the following are made available with this package: * Synchronize your email aliases as identities in Roundcube - * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) plugins by default - * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed Nextcloud or Baïkal, it will automatically add the corresponding and existing address book. + * Install the [contextmenu](https://packagist.org/packages/johndoh/contextmenu) and [automatic addressbook](https://packagist.org/packages/projectmyst/automatic_addressbook) plugins by default + * Allow to install the [CardDAV](https://packagist.org/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed Nextcloud or Baïkal, it will automatically add the corresponding and existing address book. * Support for PGP encryption with Enigma plugin by default. -**Shipped version:** 1.5.2~ynh1 +**Shipped version:** 1.5.3~ynh1 **Demo:** https://demo.yunohost.org/webmail/ ## Screenshots -![](./doc/screenshots/screenshot.png) +![Screenshot of Roundcube](./doc/screenshots/screenshot.png) ## Disclaimers / important information @@ -51,7 +51,7 @@ You can also install other plugins - which will not be removed with upgrades. To ##### From the Plugin Repository -Let's say for example that we want to install the [html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier) plugin. +Let's say for example that we want to install the [html5_notifier](https://packagist.org/packages/kitist/html5_notifier) plugin. 1. Connect to your server as root using SSH: ``` @@ -84,21 +84,22 @@ You can also download the plugin and put it under the `plugins/` directory. In t ## Documentation and resources -* Official app website: https://roundcube.net/ -* Official admin documentation: https://github.com/roundcube/roundcubemail/wiki -* Upstream app code repository: https://github.com/roundcube/roundcubemail -* YunoHost documentation for this app: https://yunohost.org/app_roundcube -* Report a bug: https://github.com/YunoHost-Apps/roundcube_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug or sudo yunohost app upgrade roundcube -u https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 9cfc748..10e27d1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Roundcube pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/roundcube.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/roundcube.maintain.svg) [![Installer Roundcube avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=roundcube) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Roundcube 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.* @@ -18,19 +22,19 @@ Roundcube est un client IMAP multilingue basé sur un navigateur avec une interf En plus des fonctionnalités principales de Roundcube, les éléments suivants sont disponibles avec ce paquet : * Synchronisez vos alias de messagerie en tant qu'identités dans Roundcube. - * Installation des plugins [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) - et [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) par default. - * Permettre d'installer [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (carnet d'adresses) de synchronisation à l'installation - notez que si vous avez installé Nextcloud ou Baïkal, il ajoutera automatiquement le carnet d'adresses correspondant. + * Installation des plugins [contextmenu](https://packagist.org/packages/johndoh/contextmenu) + et [automatic addressbook](https://packagist.org/packages/projectmyst/automatic_addressbook) par default. + * Permettre d'installer [CardDAV](https://packagist.org/packages/roundcube/carddav) (carnet d'adresses) de synchronisation à l'installation - notez que si vous avez installé Nextcloud ou Baïkal, il ajoutera automatiquement le carnet d'adresses correspondant. * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. -**Version incluse :** 1.5.2~ynh1 +**Version incluse :** 1.5.3~ynh1 **Démo :** https://demo.yunohost.org/webmail/ ## Captures d'écran -![](./doc/screenshots/screenshot.png) +![Capture d'écran de Roundcube](./doc/screenshots/screenshot.png) ## Avertissements / informations importantes @@ -48,7 +52,7 @@ Vous pouvez également installer d'autres plugins (qui ne seront pas supprimés ##### Depuis le dépôt de plugins -Si, par exemple, vous voulez installer le plugin [html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier). +Si, par exemple, vous voulez installer le plugin [html5_notifier](https://packagist.org/packages/kitist/html5_notifier). 1. Connectez-vous en SSH à votre serveur en tant que root : ``` @@ -81,21 +85,22 @@ Vous pouvez également télécharger le plugin et le placer dans le répertoire ## Documentations et ressources -* Site officiel de l'app : https://roundcube.net/ -* Documentation officielle de l'admin : https://github.com/roundcube/roundcubemail/wiki -* Dépôt de code officiel de l'app : https://github.com/roundcube/roundcubemail -* Documentation YunoHost pour cette app : https://yunohost.org/app_roundcube -* Signaler un bug : https://github.com/YunoHost-Apps/roundcube_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug ou sudo yunohost app upgrade roundcube -u https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/app.src b/conf/app.src index 0f1b6cc..ef45d37 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.2/roundcubemail-1.5.2.tar.gz -SOURCE_SUM=e8ddba93e308903a5603535eb98b9392a34078fec0355f658f0e7facc424c683 +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3.tar.gz +SOURCE_SUM=22fdfa0f868fc478dfbb1dfa9bcd5fc91be981182334ca6079ad1ae03ac4c96e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.inc.php b/conf/config.inc.php index 722521b..b32544c 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -139,6 +139,7 @@ $config['plugins'] = array( 'markasjunk', 'new_user_dialog', 'new_user_identity', + 'newmail_notifier', 'enigma', // installed plugins ); diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 35ccd0b..1ecb1bf 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -5,6 +5,6 @@ Roundcube is a browser-based multilingual IMAP client with an application-like u In addition to Roundcube core features, the following are made available with this package: * Synchronize your email aliases as identities in Roundcube - * Install the [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) and [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) plugins by default - * Allow to install the [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed Nextcloud or Baïkal, it will automatically add the corresponding and existing address book. + * Install the [contextmenu](https://packagist.org/packages/johndoh/contextmenu) and [automatic addressbook](https://packagist.org/packages/projectmyst/automatic_addressbook) plugins by default + * Allow to install the [CardDAV](https://packagist.org/packages/roundcube/carddav) (address book) synchronization plugin at the installation - note that if you have installed Nextcloud or Baïkal, it will automatically add the corresponding and existing address book. * Support for PGP encryption with Enigma plugin by default. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 3e2f030..be0b7b4 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -5,7 +5,7 @@ Roundcube est un client IMAP multilingue basé sur un navigateur avec une interf En plus des fonctionnalités principales de Roundcube, les éléments suivants sont disponibles avec ce paquet : * Synchronisez vos alias de messagerie en tant qu'identités dans Roundcube. - * Installation des plugins [contextmenu](https://plugins.roundcube.net/packages/johndoh/contextmenu) - et [automatic addressbook](https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook) par default. - * Permettre d'installer [CardDAV](https://plugins.roundcube.net/packages/roundcube/carddav) (carnet d'adresses) de synchronisation à l'installation - notez que si vous avez installé Nextcloud ou Baïkal, il ajoutera automatiquement le carnet d'adresses correspondant. + * Installation des plugins [contextmenu](https://packagist.org/packages/johndoh/contextmenu) + et [automatic addressbook](https://packagist.org/packages/projectmyst/automatic_addressbook) par default. + * Permettre d'installer [CardDAV](https://packagist.org/packages/roundcube/carddav) (carnet d'adresses) de synchronisation à l'installation - notez que si vous avez installé Nextcloud ou Baïkal, il ajoutera automatiquement le carnet d'adresses correspondant. * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index f7987e0..935843a 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -12,7 +12,7 @@ You can also install other plugins - which will not be removed with upgrades. To ##### From the Plugin Repository -Let's say for example that we want to install the [html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier) plugin. +Let's say for example that we want to install the [html5_notifier](https://packagist.org/packages/kitist/html5_notifier) plugin. 1. Connect to your server as root using SSH: ``` diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 60d456f..8c5d183 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -12,7 +12,7 @@ Vous pouvez également installer d'autres plugins (qui ne seront pas supprimés ##### Depuis le dépôt de plugins -Si, par exemple, vous voulez installer le plugin [html5_notifier](https://plugins.roundcube.net/packages/kitist/html5_notifier). +Si, par exemple, vous voulez installer le plugin [html5_notifier](https://packagist.org/packages/kitist/html5_notifier). 1. Connectez-vous en SSH à votre serveur en tant que root : ``` diff --git a/manifest.json b/manifest.json index 3fccce9..5ff2549 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Webmail software", "fr": "Webmail Open Source" }, - "version": "1.5.2~ynh1", + "version": "1.5.3~ynh1", "url": "https://roundcube.net/", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 7712b9e..ad483bc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,12 +10,12 @@ YNH_PHP_VERSION="7.3" pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl" # Composer version -YNH_COMPOSER_VERSION=2.1.1 +YNH_COMPOSER_VERSION=2.3.7 # Plugins version -contextmenu_version=3.3 +contextmenu_version=3.3.1 automatic_addressbook_version=v0.4.3 -carddav_version=4.3.0 +carddav_version=4.4.1 #================================================= # EXPERIMENTAL HELPERS diff --git a/scripts/install b/scripts/install index 5120e14..ebb8c65 100644 --- a/scripts/install +++ b/scripts/install @@ -58,7 +58,7 @@ ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # INSTALL DEPENDENCIES @@ -123,7 +123,7 @@ ynh_install_composer #================================================= ynh_script_progression --message="Initializing database..." --weight=3 -ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \ +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" \ < "$final_path/SQL/mysql.initial.sql" #================================================= diff --git a/scripts/remove b/scripts/remove index 2c7f294..dd5bd70 100644 --- a/scripts/remove +++ b/scripts/remove @@ -18,6 +18,7 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= @@ -26,7 +27,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) ynh_script_progression --message="Removing the MySQL database..." --weight=2 # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db --db_user=$db_name --db_name=$db_name +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR diff --git a/scripts/restore b/scripts/restore index 8022c1b..25c084d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -93,8 +93,8 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Restoring the MySQL database..." --weight=5 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) -ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd -ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # GENERIC FINALIZATION