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 1/9] 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 From 35f397168d793df69f0fe03c81a2e835c257caff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 5 Aug 2022 17:15:52 +0200 Subject: [PATCH 2/9] version 16 (#146) * Fix * Auto-update README * Update config.inc.php * Update config.inc.php * Update install * Update install * Update install * Update install * Update upgrade * PHP8.0 * Update app.src * Update restore Co-authored-by: Yunohost-Bot <> --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- conf/config.inc.php | 10 +++------- manifest.json | 4 ++-- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/restore | 24 +++++++++++++----------- scripts/upgrade | 2 +- 9 files changed, 25 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 9fac1cd..e1328d9 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ In addition to Roundcube core features, the following are made available with th * Support for PGP encryption with Enigma plugin by default. -**Shipped version:** 1.5.3~ynh1 +**Shipped version:** 1.6.0~ynh1 **Demo:** https://demo.yunohost.org/webmail/ diff --git a/README_fr.md b/README_fr.md index 10e27d1..6366152 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. -**Version incluse :** 1.5.3~ynh1 +**Version incluse :** 1.6.0~ynh1 **Démo :** https://demo.yunohost.org/webmail/ diff --git a/conf/app.src b/conf/app.src index ef45d37..3f7ef4e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3.tar.gz -SOURCE_SUM=22fdfa0f868fc478dfbb1dfa9bcd5fc91be981182334ca6079ad1ae03ac4c96e +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0-complete.tar.gz +SOURCE_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba 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 b32544c..791ceab 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -41,7 +41,7 @@ $config['db_dsnw'] = 'mysql://__DB_NAME__:__DB_PWD__@localhost/__DB_NAME__'; // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %s - domain name after the '@' from e-mail address provided at login screen // For example %n = mail.domain.tld, %t = domain.tld -$config['default_host'] = 'localhost'; +$config['imap_host'] = 'localhost:143'; // SMTP server host (for sending mails). // Enter hostname with prefix ssl:// to use Implicit TLS, or use @@ -55,10 +55,7 @@ $config['default_host'] = 'localhost'; // For example %n = mail.domain.tld, %t = domain.tld // To specify different SMTP servers for different IMAP hosts provide an array // of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net'] -$config['smtp_server'] = 'tls://' . $main_domain; - -// SMTP port. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default) -$config['smtp_port'] = 587; +$config['smtp_host'] = 'tls://' . $main_domain; // SMTP username (if required) if you use %u as the username Roundcube // will use the current username for login @@ -113,8 +110,7 @@ $config['enable_spellcheck'] = false; // Enable YunoHost users search in the address book. $config['ldap_public']['yunohost'] = array( 'name' => 'YunoHost Users', - 'hosts' => array('localhost'), - 'port' => 389, + 'hosts' => array('localhost:389'), 'user_specific' => false, 'base_dn' => 'ou=users,dc=yunohost,dc=org', 'scope' => 'list', diff --git a/manifest.json b/manifest.json index 5ff2549..7fdc88c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Webmail software", "fr": "Webmail Open Source" }, - "version": "1.5.3~ynh1", + "version": "1.6.0~ynh1", "url": "https://roundcube.net/", "upstream": { "license": "GPL-3.0-only", @@ -26,7 +26,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php8.0-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index ad483bc..970cf36 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="8.0" # Package dependencies 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" diff --git a/scripts/install b/scripts/install index ebb8c65..8580532 100644 --- a/scripts/install +++ b/scripts/install @@ -203,7 +203,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& # Update javascript dependencies (cd "$final_path" -/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) +/usr/bin/php$phpversion -q ./bin/update.sh -v ?) # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" diff --git a/scripts/restore b/scripts/restore index 25c084d..1e028d3 100644 --- a/scripts/restore +++ b/scripts/restore @@ -38,16 +38,11 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=3 -test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " +test ! -d $final_path \ + || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -67,6 +62,14 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" +#================================================= +# REINSTALL DEPENDENCIES +#================================================= +ynh_script_progression --message="Reinstalling dependencies..." --weight=1 + +# Define and install dependencies +ynh_install_app_dependencies $pkg_dependencies + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -78,12 +81,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion #================================================= -# REINSTALL DEPENDENCIES +# RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 -# Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # SPECIFIC RESTORATION diff --git a/scripts/upgrade b/scripts/upgrade index 1877b73..cbf0e91 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -255,7 +255,7 @@ then # Update JavaScript dependencies (cd "$final_path" - /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) + /usr/bin/php$phpversion -q ./bin/update.sh -v ?) # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" From 272198d161c53b2511aaa3fe38ed5ba3d0b2f6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 14 Aug 2022 19:58:24 +0200 Subject: [PATCH 3/9] bullseye (#149) * bullseye * Auto-update README * Update app.src * set max filesize * Fix Co-authored-by: yunohost-bot --- README.md | 1 + README_fr.md | 3 ++- conf/app.src | 4 ++-- conf/nginx.conf | 2 +- conf/php-fpm.conf | 4 ++-- manifest.json | 2 +- scripts/_common.sh | 4 ++-- scripts/backup | 2 +- scripts/upgrade | 4 ++++ 9 files changed, 16 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e1328d9..ed44da3 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ In addition to Roundcube core features, the following are made available with th **Shipped version:** 1.6.0~ynh1 + **Demo:** https://demo.yunohost.org/webmail/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 6366152..40c4ee1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,8 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. -**Version incluse :** 1.6.0~ynh1 +**Version incluse :** 1.6.0~ynh1 + **Démo :** https://demo.yunohost.org/webmail/ diff --git a/conf/app.src b/conf/app.src index 3f7ef4e..aefdce3 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0-complete.tar.gz -SOURCE_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0.tar.gz +SOURCE_SUM=1224eaf628888e503c49d0e8a69aa4997e566c3605738d0303d9c7a09722f363 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 7f4196e..f7c3927 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,7 +5,7 @@ location __PATH__/ { alias __FINALPATH__/ ; index index.php; - client_max_body_size 10G; + client_max_body_size 50M; try_files $uri $uri/ /index.php?q=$uri&$args; # pass PHP scripts to FastCGI server diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 61b251f..e8885d3 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -419,8 +419,8 @@ chdir = __FINALPATH__ ;php_admin_value[memory_limit] = 32M ; Common values to change to increase file upload limit -; php_admin_value[upload_max_filesize] = 50M -; php_admin_value[post_max_size] = 50M +php_admin_value[upload_max_filesize] = 50M +php_admin_value[post_max_size] = 50M ; php_admin_flag[mail.add_x_header] = Off ; Other common parameters diff --git a/manifest.json b/manifest.json index 7fdc88c..16a25cd 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.3.2" + "yunohost": ">= 11.0.9" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 970cf36..d9237d1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,10 +7,10 @@ YNH_PHP_VERSION="8.0" # Package dependencies -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" +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}-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.3.7 +YNH_COMPOSER_VERSION=2.3.10 # Plugins version contextmenu_version=3.3.1 diff --git a/scripts/backup b/scripts/backup index 3167c87..6f4f9c1 100644 --- a/scripts/backup +++ b/scripts/backup @@ -26,7 +26,7 @@ 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) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # DECLARE DATA AND CONF FILES TO BACKUP diff --git a/scripts/upgrade b/scripts/upgrade index cbf0e91..0acf609 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,6 +172,10 @@ then #================================================= ynh_script_progression --message="Updating dependencies with Composer..." --weight=30 + # Install composer.json + cp "$final_path/composer.json-dist" "$final_path/composer.json" + + # Upgrade composer itself ynh_install_composer From 01894bf05238bbade88118fb637eb76af302e8e2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 08:41:00 +0200 Subject: [PATCH 4/9] Update manifest.json --- manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 16a25cd..939ece9 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,8 @@ "website": "https://roundcube.net/", "demo": "https://demo.yunohost.org/webmail/", "admindoc": "https://github.com/roundcube/roundcubemail/wiki", - "code": "https://github.com/roundcube/roundcubemail" + "code": "https://github.com/roundcube/roundcubemail", + "cpe": "cpe:2.3:a:roundcube:webmail" }, "license": "GPL-3.0-only", "maintainer": { From 6b58e58582643215e17c7658257d92926d05fefa Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 09:30:27 +0200 Subject: [PATCH 5/9] Update upgrade --- scripts/upgrade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0acf609..d6ad4ba 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -131,14 +131,6 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:www-data "$final_path" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= @@ -154,6 +146,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5 # Create a dedicated PHP-FPM config ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + #================================================= # SPECIFIC UPGRADE #================================================= From d5b9b37864717bace08ca7a41bb5fbaf5b7de037 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 12:03:03 +0200 Subject: [PATCH 6/9] PHP7.4 --- manifest.json | 2 +- scripts/_common.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 939ece9..59effea 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "multi_instance": true, "services": [ "nginx", - "php8.0-fpm", + "php7.4-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index d9237d1..8ee2bc2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,10 +4,10 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" +YNH_PHP_VERSION="7.4" # Package dependencies -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}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl" +pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl 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.3.10 From 9785bd642a1cf67694557f00aec341b76946eb1f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 13:13:47 +0200 Subject: [PATCH 7/9] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index d6ad4ba..3ecbb67 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -173,7 +173,7 @@ then ynh_script_progression --message="Updating dependencies with Composer..." --weight=30 # Install composer.json - cp "$final_path/composer.json-dist" "$final_path/composer.json" + #cp "$final_path/composer.json-dist" "$final_path/composer.json" # Upgrade composer itself From 552d72f8259c0084baa0a0fa35711b48783f822b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 13:35:02 +0200 Subject: [PATCH 8/9] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8ee2bc2..1433a9d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ YNH_PHP_VERSION="7.4" pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl 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.3.10 +YNH_COMPOSER_VERSION=2.3.7 # Plugins version contextmenu_version=3.3.1 From 8a026e6fc41e537f8d9499747d81b14d03e85bfc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Aug 2022 14:27:39 +0200 Subject: [PATCH 9/9] Update upgrade --- scripts/upgrade | 4 ---- 1 file changed, 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3ecbb67..488fb83 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -172,10 +172,6 @@ then #================================================= ynh_script_progression --message="Updating dependencies with Composer..." --weight=30 - # Install composer.json - #cp "$final_path/composer.json-dist" "$final_path/composer.json" - - # Upgrade composer itself ynh_install_composer