From 0d31ab8fc867b21f44c975ae839da6d27f5cac8f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 25 Feb 2021 23:43:48 +0100 Subject: [PATCH 01/78] Upgrade to 1.5.0 beta --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- conf/config.inc.php | 52 +++++++++++++++++++--------------------- manifest.json | 4 ++-- pull_request_template.md | 8 ------- scripts/install | 6 ++--- scripts/upgrade | 8 +++---- 8 files changed, 38 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index b33a12b..3b88944 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. -**Shipped version:** 1.4.11 +**Shipped version:** 1.5.0 ## Screenshots diff --git a/README_fr.md b/README_fr.md index adba282..3d0a039 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Overview [Roundcube](https://roundcube.net/) est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application. -**Shipped version:** 1.4.11 +**Shipped version:** 1.5.0 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 546145a..3c7baac 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.11/roundcubemail-1.4.11.tar.gz -SOURCE_SUM=524a6c8095508b8d911c0c5121ea6d16ca4c42894e10aaa0e29ded983687923c +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5-beta/roundcubemail-1.5-beta.tar.gz +SOURCE_SUM=d42f19510d4c1996ff1e6d9c50e018c8af7faa464c329d9e2faf7a363b12cbd4 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 138a935..2df7dc3 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -2,19 +2,14 @@ /* +-----------------------------------------------------------------------+ - | YunoHost configuration for the Roundcube Webmail installation. | + | Local configuration for the Roundcube Webmail installation. | | | - | This is based on the sample configuration file which is shipped with | - | Roundcube and adapted to works with YunoHost. It comes with some | - | additionnal activated plugins for a better integration and | - | experience. | - | | - | You can override and extend this configuration in local.inc.php. | - | | - | DO NOT EDIT THIS FILE BY HAND, IT WILL BE OVERWRITTEN AT UPGRADES. | + | This is a sample configuration file only containing the minimum | + | setup required for a functional installation. Copy more options | + | from defaults.inc.php to this file to override the defaults. | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2013, The Roundcube Dev Team | + | Copyright (C) The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -29,26 +24,28 @@ $config = array(); // Database connection string (DSN) for read+write operations // Format (compatible with PEAR MDB2): db_provider://user:password@host/database -// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv +// Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php -// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646' -$config['db_dsnw'] = 'mysql://__DBUSER__:__DBPASS__@localhost/__DBNAME__'; +// NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646' +// or (Windows): 'sqlite:///C:/full/path/to/sqlite.db' +$config['db_dsnw'] = 'mysql://__DB_USER__:__DB_PWD__@localhost/__DB_NAME__'; -// The mail host chosen to perform the log-in. +// The IMAP host chosen to perform the log-in. // Leave blank to show a textbox at login, give a list of hosts // to display a pulldown menu or set one host as string. -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// +// Enter hostname with prefix ssl:// to use Implicit TLS, or use +// prefix tls:// to use STARTTLS. // Supported replacement variables: // %n - hostname ($_SERVER['SERVER_NAME']) // %t - hostname without the first part // %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['default_host'] = '%t'; // SMTP server host (for sending mails). -// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls:// -// If left blank, the PHP mail() function is used +// Enter hostname with prefix ssl:// to use Implicit TLS, or use +// prefix tls:// to use STARTTLS. // Supported replacement variables: // %h - user's IMAP hostname // %n - hostname ($_SERVER['SERVER_NAME']) @@ -56,10 +53,11 @@ $config['default_host'] = 'localhost'; // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) // For example %n = mail.domain.tld, %t = domain.tld +// To specify differnt 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 (default is 25; use 587 for STARTTLS or 465 for the -// deprecated SSL over SMTP (aka SMTPS)) +// SMTP port. Use 25 for cleartext, 465 for Implicit TLS, or 587 for STARTTLS (default) $config['smtp_port'] = 587; // SMTP username (if required) if you use %u as the username Roundcube @@ -90,9 +88,9 @@ $config['support_url'] = 'https://forum.yunohost.org/t/roundcube-a-webmail/3965' // Name your service. This is displayed on the login screen and in the window title $config['product_name'] = 'YunoHost Webmail'; -// this key is used to encrypt the users imap password which is stored -// in the session record (and the client cookie if remember password is enabled). -// please provide a string of exactly 24 chars. +// This key is used to encrypt the users imap password which is stored +// in the session record. For the default cipher method it must be +// exactly 24 characters long. // YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS $config['des_key'] = '__DESKEY__'; @@ -126,10 +124,10 @@ $config['ldap_public']['yunohost'] = array( 'hidden' => false, 'searchonly' => true, 'fieldmap' => array( - 'name' => 'uid', - 'surname' => 'sn', - 'firstname' => 'givenName', - 'email' => 'mail:*', + 'name' => 'uid', + 'surname' => 'sn', + 'firstname' => 'givenName', + 'email' => 'mail:*', ), ); diff --git a/manifest.json b/manifest.json index a2fe095..4c0dd52 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Webmail software", "fr": "Webmail Open Source" }, - "version": "1.4.11~ynh1", + "version": "1.5.0~ynh1", "url": "https://roundcube.net/", "license": "GPL-3.0-only", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/pull_request_template.md b/pull_request_template.md index f501dd4..0a198cf 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,14 +11,6 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation ---- -*Minor decision* -- **Upgrade previous version** : -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -- [ ] **Approval (LGTM)** : - ## Package_check results --- * An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* diff --git a/scripts/install b/scripts/install index 6cdb97b..87491bd 100644 --- a/scripts/install +++ b/scripts/install @@ -126,9 +126,9 @@ rc_conf="$final_path/config/config.inc.php" cp ../conf/config.inc.php "$rc_conf" ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DBUSER__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index c9366fa..c3bbc30 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,6 +24,7 @@ with_carddav=$(ynh_app_setting_get --app=$app --key=with_carddav) with_enigma=$(ynh_app_setting_get --app=$app --key=with_enigma) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) language=$(ynh_app_setting_get --app=$app --key=language) +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) #================================================= # CHECK VERSION @@ -149,10 +150,9 @@ then cp ../conf/config.inc.php "$rc_conf" ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DBUSER__" --replace_string=$db_name --target_file="$rc_conf" - db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - ynh_replace_string --match_string="__DBPASS__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DBNAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= From 9326a594ad749de07bec5c8fd897d9069b057101 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 00:00:04 +0100 Subject: [PATCH 02/78] Update upgrade --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c3bbc30..709c880 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -171,6 +171,7 @@ then # Install composer.json cp "$final_path/composer.json-dist" "$final_path/composer.json" fi + #================================================= # UPGRADE ADDITIONAL PLUGINS #================================================= @@ -259,7 +260,8 @@ then ynh_script_progression --message="Updating $app core..." --weight=4 ( cd "$final_path" - ynh_exec_warn ./bin/update.sh --version=$oldversion -y) + ynh_exec_warn ./bin/update.sh --version=$oldversion -y + php$phpversion composer.phar update --no-dev) fi #================================================= From c1bde118f1502d0313ac30668444949185a4b55f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 00:10:08 +0100 Subject: [PATCH 03/78] Upgrade composer --- scripts/_common.sh | 4 ++-- scripts/upgrade | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 45bb9ec..da3eb2a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ YNH_PHP_VERSION="7.3" extra_php_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 -composer_version=1.10.17 +composer_version=2.0.11 # Plugins version contextmenu_version=2.3 @@ -21,7 +21,7 @@ carddav_version=3.0.3 # EXPERIMENTAL HELPERS #================================================= -readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17 +readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.11 # Declare the actual composer version to use. # A packager willing to use another version of composer can override the variable into its _common.sh. YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} diff --git a/scripts/upgrade b/scripts/upgrade index 709c880..c625ec8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -261,7 +261,7 @@ then ( cd "$final_path" ynh_exec_warn ./bin/update.sh --version=$oldversion -y - php$phpversion composer.phar update --no-dev) + sudo -u $app php$phpversion composer.phar update --no-dev) fi #================================================= From 285f69c7a4c3684218c87df5873ae3331e51fca5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Feb 2021 00:12:36 +0100 Subject: [PATCH 04/78] Update upgrade --- scripts/upgrade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c625ec8..b6cf121 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -260,8 +260,7 @@ then ynh_script_progression --message="Updating $app core..." --weight=4 ( cd "$final_path" - ynh_exec_warn ./bin/update.sh --version=$oldversion -y - sudo -u $app php$phpversion composer.phar update --no-dev) + ynh_exec_warn ./bin/update.sh --version=$oldversion -y) fi #================================================= From 5cb96da4e62cad8abcc408637e509d7978d6990b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 15 Mar 2021 09:18:47 +0100 Subject: [PATCH 05/78] Update manifest.json --- manifest.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/manifest.json b/manifest.json index 21ce8ac..c6064ae 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.0.7" + "yunohost": ">= 4.1.7" }, "multi_instance": true, "services": [ @@ -27,19 +27,11 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Roundcube", - "fr": "Choisissez un domaine pour Roundcube" - }, "example": "domain.org" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Roundcube", - "fr": "Choisissez un chemin pour Roundcube" - }, "example": "/webmail", "default": "/webmail" }, From 9484e1dec8be1082554b7da7a3625182bdda5761 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Mar 2021 19:33:07 +0100 Subject: [PATCH 06/78] Secure config file --- README.md | 2 +- README_fr.md | 2 +- scripts/install | 41 ++++++++++++++++++++++++----------------- scripts/restore | 18 ++++++++++-------- scripts/upgrade | 40 +++++++++++++++++++++++----------------- 5 files changed, 59 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 3b88944..13bd61e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ You can extend - or even override - the Roundcube configuration which is coming ## Documentation * Official documentation: https://github.com/roundcube/roundcubemail/wiki - * YunoHost documentation: https://github.com/YunoHost/doc/blob/master/app_roundcube.md: + * YunoHost documentation: https://yunohost.org/en/app_roundcube ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 3d0a039..7849826 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Vous pouvez étendre (ou même remplacer) la configuration de Roundcube fournie ## Documentation * Documentation officielle : https://github.com/roundcube/roundcubemail/wiki - * Documentation YunoHost : https://github.com/YunoHost/doc/blob/master/app_roundcube.md: + * Documentation YunoHost : https://yunohost.org/fr/app_roundcube ## Caractéristiques spécifiques YunoHost diff --git a/scripts/install b/scripts/install index 87491bd..cac6f1c 100644 --- a/scripts/install +++ b/scripts/install @@ -61,6 +61,14 @@ db_name=$(ynh_sanitize_dbid --db_name=$app) ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." --weight=3 + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -78,14 +86,6 @@ ynh_script_progression --message="Configuring NGINX web server..." --weight=2 # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." --weight=3 - -# Create a system user -ynh_system_user_create --username=$app - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -121,15 +121,19 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -rc_conf="$final_path/config/config.inc.php" +#rc_conf="$final_path/config/config.inc.php" -cp ../conf/config.inc.php "$rc_conf" +deskey=$(ynh_string_random --length=24) -ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" +# cp ../conf/config.inc.php "$rc_conf" + +# ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" +# ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" +# ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +# ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" +# ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # INSTALL ADDITIONAL PLUGINS @@ -204,14 +208,14 @@ fi #================================================= ynh_script_progression --message="Updating Roundcube configuration..." --weight=3 -ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$rc_conf" +ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$final_path/config/config.inc.php" # Update javascript dependencies (cd "$final_path" /usr/bin/php -q ./bin/install-jsdeps.sh) # Store the config file checksum into the app settings -ynh_store_file_checksum --file="$rc_conf" +ynh_store_file_checksum --file="$final_path/config/config.inc.php" #================================================= # GENERIC FINALIZATION @@ -224,6 +228,9 @@ chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} +chmod 600 "$final_path/config/config.inc.php" +chown $app:$app "$final_path/some_config_file" + #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/restore b/scripts/restore index a7cd2b5..a105622 100644 --- a/scripts/restore +++ b/scripts/restore @@ -46,6 +46,13 @@ test ! -d $final_path \ #================================================= ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." --weight=4 + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR @@ -54,14 +61,6 @@ ynh_script_progression --message="Restoring $app main directory..." ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." --weight=4 - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app - #================================================= # RESTORE USER RIGHTS #================================================= @@ -71,6 +70,9 @@ chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} +chmod 600 "$final_path/config/config.inc.php" +chown $app:$app "$final_path/some_config_file" + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b6cf121..5d93a7f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -91,6 +91,14 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# 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" + #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -116,14 +124,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# 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 - #================================================= # PHP-FPM CONFIGURATION #================================================= @@ -145,15 +145,18 @@ then rc_conf="$final_path/config/config.inc.php" # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$rc_conf" + # ynh_backup_if_checksum_is_different "$rc_conf" - cp ../conf/config.inc.php "$rc_conf" + # cp ../conf/config.inc.php "$rc_conf" - ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + # ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" + # ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" + # ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + # ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" + # ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + + deskey=$(ynh_string_random --length=24) + ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER @@ -245,14 +248,14 @@ then #================================================= ynh_script_progression --message="Updating $app configuration..." --weight=4 - ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$rc_conf" + ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&\n $installed_plugins" --target_file="$final_path/config/config.inc.php" # Update JavaScript dependencies (cd "$final_path" /usr/bin/php -q ./bin/install-jsdeps.sh) # Store the config file checksum into the app settings - ynh_store_file_checksum --file="$rc_conf" + ynh_store_file_checksum --file="$final_path/config/config.inc.php" #================================================= # UPDATE ROUNDCUBE CORE @@ -274,6 +277,9 @@ chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} +chmod 600 "$final_path/config/config.inc.php" +chown $app:$app "$final_path/some_config_file" + #================================================= # RELOAD NGINX #================================================= From 83545c7496da530c72ec6af62313b123b1cad1be Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 22 Mar 2021 19:34:43 +0100 Subject: [PATCH 07/78] Update restore --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index a105622..9f4111e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -46,6 +46,7 @@ test ! -d $final_path \ #================================================= ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" + #================================================= # RECREATE THE DEDICATED USER #================================================= From 9dc5a308f9c3d1e6aaba18190c83d41dab32316f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Mar 2021 08:27:18 +0100 Subject: [PATCH 08/78] Cleaning up --- scripts/install | 11 ----------- scripts/upgrade | 12 ------------ 2 files changed, 23 deletions(-) diff --git a/scripts/install b/scripts/install index cac6f1c..5eff19a 100644 --- a/scripts/install +++ b/scripts/install @@ -121,18 +121,7 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -#rc_conf="$final_path/config/config.inc.php" - deskey=$(ynh_string_random --length=24) - -# cp ../conf/config.inc.php "$rc_conf" - -# ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -# ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" -# ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -# ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -# ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" - ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 5d93a7f..f3ae0cb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,18 +143,6 @@ then ynh_script_progression --message="Reconfiguring Roundcube..." rc_conf="$final_path/config/config.inc.php" - - # Verify the checksum and backup the file if it's different - # ynh_backup_if_checksum_is_different "$rc_conf" - - # cp ../conf/config.inc.php "$rc_conf" - - # ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - # ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" - # ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - # ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - # ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" - deskey=$(ynh_string_random --length=24) ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" From 917caf35c10a62d99fac64f643276048251640b3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Mar 2021 08:30:02 +0100 Subject: [PATCH 09/78] Add db_user --- scripts/install | 1 + scripts/restore | 1 + scripts/upgrade | 1 + 3 files changed, 3 insertions(+) diff --git a/scripts/install b/scripts/install index 5eff19a..b5d3dfe 100644 --- a/scripts/install +++ b/scripts/install @@ -58,6 +58,7 @@ ynh_app_setting_set --app=$app --key=language --value=$language ynh_script_progression --message="Creating a MySQL database..." 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 diff --git a/scripts/restore b/scripts/restore index 9f4111e..4bc63fa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,6 +27,7 @@ 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) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f3ae0cb..dfa5ae1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,6 +20,7 @@ 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) db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name with_carddav=$(ynh_app_setting_get --app=$app --key=with_carddav) with_enigma=$(ynh_app_setting_get --app=$app --key=with_enigma) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) From 553ed4e02f7978c85eb55b8ffa8c906bbd98d0f3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Mar 2021 09:05:56 +0100 Subject: [PATCH 10/78] Fix --- scripts/install | 11 +++++++++-- scripts/upgrade | 13 +++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index b5d3dfe..5ee7aef 100644 --- a/scripts/install +++ b/scripts/install @@ -122,8 +122,15 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -deskey=$(ynh_string_random --length=24) -ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" +rc_conf="$final_path/config/config.inc.php" + +cp ../conf/config.inc.php "$rc_conf" + +ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index dfa5ae1..550080a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,8 +144,17 @@ then ynh_script_progression --message="Reconfiguring Roundcube..." rc_conf="$final_path/config/config.inc.php" - deskey=$(ynh_string_random --length=24) - ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" + + # Verify the checksum and backup the file if it's different + ynh_backup_if_checksum_is_different "$rc_conf" + + cp ../conf/config.inc.php "$rc_conf" + + ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_name --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER From 9c15d49eeab87b977ad4afa6e00f010f5058ee90 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Mar 2021 16:21:22 +0100 Subject: [PATCH 11/78] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 5ee7aef..fd59465 100644 --- a/scripts/install +++ b/scripts/install @@ -226,7 +226,7 @@ mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} chmod 600 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/some_config_file" +chown $app:$app "$final_path/config/config.inc.php" #================================================= # RELOAD NGINX From da6411e62cd5c385958969863ea0ca747755193a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 26 Mar 2021 16:22:02 +0100 Subject: [PATCH 12/78] =?UTF-8?q?=F0=9F=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/restore | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 4bc63fa..86386d8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -73,7 +73,7 @@ mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} chmod 600 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/some_config_file" +chown $app:$app "$final_path/config/config.inc.php" #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 550080a..b83edf7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -276,7 +276,7 @@ mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} chmod 600 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/some_config_file" +chown $app:$app "$final_path/config/config.inc.php" #================================================= # RELOAD NGINX From e3f06bd9306d359408ac180fb6834c382390da65 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 11 Apr 2021 19:39:26 +0200 Subject: [PATCH 13/78] Fix badges --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 13bd61e..43024b7 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,8 @@ In addition to Roundcube core features, the following are made available with th #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) ## Limitations diff --git a/README_fr.md b/README_fr.md index 7849826..588f5f1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -45,8 +45,8 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) ## Limitations From c9f4a58bf065423d8eda9e88d01341d827295b35 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 21 Apr 2021 23:09:56 +0200 Subject: [PATCH 14/78] Cleaning up --- check_process | 1 - conf/config.inc.php | 2 +- manifest.json | 2 +- scripts/install | 13 ++++--------- scripts/upgrade | 14 +++----------- 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/check_process b/check_process index 5499e44..6755534 100644 --- a/check_process +++ b/check_process @@ -14,7 +14,6 @@ upgrade=1 backup_restore=1 multi_instance=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/conf/config.inc.php b/conf/config.inc.php index 2df7dc3..4012e33 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -28,7 +28,7 @@ $config = array(); // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php // NOTE: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646' // or (Windows): 'sqlite:///C:/full/path/to/sqlite.db' -$config['db_dsnw'] = 'mysql://__DB_USER__:__DB_PWD__@localhost/__DB_NAME__'; +$config['db_dsnw'] = 'mysql://__DB_NAME__:__DB_PWD__@localhost/__DB_NAME__'; // The IMAP host chosen to perform the log-in. // Leave blank to show a textbox at login, give a list of hosts diff --git a/manifest.json b/manifest.json index c6064ae..abd990f 100644 --- a/manifest.json +++ b/manifest.json @@ -42,7 +42,7 @@ "en": "Choose the application language", "fr": "Choisissez la langue de l'application" }, - "choices": ["fr_FR", "en_GB", "de_DE"], + "choices": ["de_DE", "en_GB", "fr_FR", "it_IT"], "default": "en_GB" }, { diff --git a/scripts/install b/scripts/install index fd59465..cf9d073 100644 --- a/scripts/install +++ b/scripts/install @@ -123,14 +123,9 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name ynh_script_progression --message="Configuring Roundcube..." rc_conf="$final_path/config/config.inc.php" +deskey=$(ynh_string_random --length=24) -cp ../conf/config.inc.php "$rc_conf" - -ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_USER__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" +ynh_add_config --template="../conf/config.inc.php" --destination="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS @@ -181,7 +176,7 @@ then done done - # Do not actualy add the carddav plugin if there's no carddav server available... + # Do not actualy add the cardDAV plugin if there's no carddav server available... if [ $carddav_server -eq 1 ] then installed_plugins+=" 'carddav'," @@ -225,7 +220,7 @@ chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} -chmod 600 "$final_path/config/config.inc.php" +chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b83edf7..35a373b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,17 +144,9 @@ then ynh_script_progression --message="Reconfiguring Roundcube..." rc_conf="$final_path/config/config.inc.php" + deskey=$(ynh_string_random --length=24) - # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$rc_conf" - - cp ../conf/config.inc.php "$rc_conf" - - ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_USER__" --replace_string=$db_name --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + ynh_add_config --template="../conf/config.inc.php" --destination="$rc_conf" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER @@ -275,7 +267,7 @@ chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} -chmod 600 "$final_path/config/config.inc.php" +chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" #================================================= From 0d1c4bc5007b05457831d1eab165b3993aeedd41 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 26 Apr 2021 18:48:57 +0200 Subject: [PATCH 15/78] Fix links --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43024b7..5cdb60a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ *[Lire ce readme en français.](./README_fr.md)* > *This package allow you to install Roundcube quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* +If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* ## Overview [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. diff --git a/README_fr.md b/README_fr.md index 588f5f1..2ccf883 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,7 +6,7 @@ *[Read this readme in english.](./README.md)* > *Ce package vous permet d'installer Roundcube rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* +Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* ## Overview [Roundcube](https://roundcube.net/) est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application. From a4845c8445915344a538f2b58299aa491e37bb5f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 7 May 2021 23:06:53 +0200 Subject: [PATCH 16/78] Fix --- scripts/install | 8 ++++++-- scripts/upgrade | 11 +++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index cf9d073..235d27a 100644 --- a/scripts/install +++ b/scripts/install @@ -123,9 +123,13 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name ynh_script_progression --message="Configuring Roundcube..." rc_conf="$final_path/config/config.inc.php" -deskey=$(ynh_string_random --length=24) -ynh_add_config --template="../conf/config.inc.php" --destination="$rc_conf" +cp ../conf/config.inc.php "$rc_conf" + +ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index 35a373b..a5f3381 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -144,9 +144,16 @@ then ynh_script_progression --message="Reconfiguring Roundcube..." rc_conf="$final_path/config/config.inc.php" - deskey=$(ynh_string_random --length=24) - ynh_add_config --template="../conf/config.inc.php" --destination="$rc_conf" + # Verify the checksum and backup the file if it's different + ynh_backup_if_checksum_is_different "$rc_conf" + + cp ../conf/config.inc.php "$rc_conf" + + ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER From e4eab926886fd3d6bde3005e2e43d7be2b8c40c6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 7 May 2021 23:28:44 +0200 Subject: [PATCH 17/78] Permissions --- scripts/install | 3 ++- scripts/restore | 3 ++- scripts/upgrade | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 235d27a..55ab5a7 100644 --- a/scripts/install +++ b/scripts/install @@ -220,7 +220,8 @@ ynh_store_file_checksum --file="$final_path/config/config.inc.php" #================================================= # Set permissions to app files -chown -R root: "$final_path" +chown -R root:$app "$final_path" +chmod -R o-rwx "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} diff --git a/scripts/restore b/scripts/restore index 86386d8..5dd4faf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -68,7 +68,8 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R root: "$final_path" +chown -R root:$app "$final_path" +chmod -R o-rwx "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} diff --git a/scripts/upgrade b/scripts/upgrade index a5f3381..319217f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -270,7 +270,8 @@ fi #================================================= # Set permissions to app files -chown -R root: "$final_path" +chown -R root:$app "$final_path" +chmod -R o-rwx "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} From 2b2b68e2db1d4219ea81901ccf2afadfb49fcb21 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 7 May 2021 23:30:44 +0200 Subject: [PATCH 18/78] Update change_url --- scripts/change_url | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 8ae2680..1669088 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -29,6 +29,23 @@ ynh_script_progression --message="Loading installation settings..." --weight=2 # Needed for helper "ynh_add_nginx_config" final_path=$(ynh_app_setting_get --app=$app --key=final_path) +#================================================= +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # Restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # CHECK WHICH PARTS SHOULD BE CHANGED #================================================= From 83049d86ac36674169511cd368fbcbefc0b1af06 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 7 May 2021 23:41:14 +0200 Subject: [PATCH 19/78] Update upgrade --- scripts/upgrade | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 319217f..b02701a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -78,6 +78,13 @@ fi ynh_app_setting_set --app=$app --key=language --value=$language 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 #================================================= From b8d4f740901805e7488a39f857448de369fc61a4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 8 May 2021 10:03:08 +0200 Subject: [PATCH 20/78] fix --- scripts/install | 3 +-- scripts/restore | 3 +-- scripts/upgrade | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 55ab5a7..235d27a 100644 --- a/scripts/install +++ b/scripts/install @@ -220,8 +220,7 @@ ynh_store_file_checksum --file="$final_path/config/config.inc.php" #================================================= # Set permissions to app files -chown -R root:$app "$final_path" -chmod -R o-rwx "$final_path" +chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} diff --git a/scripts/restore b/scripts/restore index 5dd4faf..86386d8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -68,8 +68,7 @@ ynh_restore_file --origin_path="$final_path" #================================================= # Restore permissions on app files -chown -R root:$app "$final_path" -chmod -R o-rwx "$final_path" +chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} diff --git a/scripts/upgrade b/scripts/upgrade index b02701a..d984a9a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -277,8 +277,7 @@ fi #================================================= # Set permissions to app files -chown -R root:$app "$final_path" -chmod -R o-rwx "$final_path" +chown -R root: "$final_path" mkdir -p "$final_path/plugins/enigma/home" chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} From c54a394ec297cbbd2424eeba6772a959527365e9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 May 2021 20:54:04 +0200 Subject: [PATCH 21/78] remove composer helper --- check_process | 4 +-- scripts/_common.sh | 63 +--------------------------------------------- 2 files changed, 3 insertions(+), 64 deletions(-) diff --git a/check_process b/check_process index 6755534..c059b34 100644 --- a/check_process +++ b/check_process @@ -1,7 +1,7 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) + domain="domain.tld" + path="/path" with_carddav=1 with_enigma=1 ; Checks diff --git a/scripts/_common.sh b/scripts/_common.sh index da3eb2a..4805d20 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ YNH_PHP_VERSION="7.3" extra_php_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 -composer_version=2.0.11 +YNH_COMPOSER_VERSION=2.0.11 # Plugins version contextmenu_version=2.3 @@ -20,64 +20,3 @@ carddav_version=3.0.3 #================================================= # EXPERIMENTAL HELPERS #================================================= - -readonly YNH_DEFAULT_COMPOSER_VERSION=2.0.11 -# Declare the actual composer version to use. -# A packager willing to use another version of composer can override the variable into its _common.sh. -YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION} - -# Execute a command with Composer -# -# usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands" -# | arg: -v, --phpversion - PHP version to use with composer -# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# | arg: -c, --commands - Commands to execute. -ynh_composer_exec () { - # Declare an array to define the options of this helper. - local legacy_args=vwc - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= ) - local phpversion - local workdir - local commands - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-$YNH_PHP_VERSION}" - - COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} "$workdir/composer.phar" $commands \ - -d "$workdir" --quiet --no-interaction -} - -# Install and initialize Composer in the given directory -# -# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion] -# | arg: -v, --phpversion - PHP version to use with composer -# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path. -# | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include -# | arg: -c, --composerversion - Composer version to install -ynh_install_composer () { - # Declare an array to define the options of this helper. - local legacy_args=vwa - declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=) - local phpversion - local workdir - local install_args - local composerversion - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - workdir="${workdir:-$final_path}" - phpversion="${phpversion:-$YNH_PHP_VERSION}" - install_args="${install_args:-}" - composerversion="${composerversion:-$YNH_COMPOSER_VERSION}" - - curl -sS https://getcomposer.org/installer \ - | COMPOSER_HOME="$workdir/.composer" \ - php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \ - || ynh_die "Unable to install Composer." - - # update dependencies to create composer.lock - ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \ - || ynh_die "Unable to update core dependencies with Composer." -} - From 42ffe8c0bb815fc5e0834f5e612c7bed56af8bab Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 May 2021 21:07:03 +0200 Subject: [PATCH 22/78] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index abd990f..359eece 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.2.4" }, "multi_instance": true, "services": [ From 5c1d372e33876898d86ab36b0c83b743ab543b59 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 May 2021 21:14:54 +0200 Subject: [PATCH 23/78] Fix --- scripts/install | 15 +++++++++------ scripts/restore | 14 +++----------- scripts/upgrade | 21 +++++++-------------- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/scripts/install b/scripts/install index 235d27a..3be75c4 100644 --- a/scripts/install +++ b/scripts/install @@ -79,6 +79,10 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -213,19 +217,18 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" +chmod 400 "$final_path/config/config.inc.php" +chown $app:$app "$final_path/config/config.inc.php" + #================================================= # GENERIC FINALIZATION #================================================= # SECURE FILES AND DIRECTORIES #================================================= -# Set permissions to app files -chown -R root: "$final_path" -mkdir -p "$final_path/plugins/enigma/home" -chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} -chmod 400 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/config/config.inc.php" + +mkdir -p "$final_path/plugins/enigma/home" #================================================= # RELOAD NGINX diff --git a/scripts/restore b/scripts/restore index 86386d8..4efc074 100644 --- a/scripts/restore +++ b/scripts/restore @@ -63,17 +63,9 @@ ynh_script_progression --message="Restoring $app main directory..." ynh_restore_file --origin_path="$final_path" -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions on app files -chown -R root: "$final_path" -mkdir -p "$final_path/plugins/enigma/home" -chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} - -chmod 600 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/config/config.inc.php" +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index d984a9a..82898a4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -124,6 +124,10 @@ then ynh_setup_source --dest_dir="$final_path" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -261,6 +265,9 @@ then # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" + chmod 400 "$final_path/config/config.inc.php" + chown $app:$app "$final_path/config/config.inc.php" + #================================================= # UPDATE ROUNDCUBE CORE #================================================= @@ -270,20 +277,6 @@ then ynh_exec_warn ./bin/update.sh --version=$oldversion -y) fi -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -# Set permissions to app files -chown -R root: "$final_path" -mkdir -p "$final_path/plugins/enigma/home" -chown -R $app: "$final_path/"{temp,logs,plugins/enigma/home} - -chmod 400 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/config/config.inc.php" - #================================================= # RELOAD NGINX #================================================= From da0849b08e85a60361e664d22f161fc3bc6d72e6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 May 2021 22:06:42 +0200 Subject: [PATCH 24/78] Add templates --- .github/ISSUE_TEMPLATE.md | 55 ++++++++++++++++++++++++++++++++ .github/PULL_REQUEST_TEMPLATE.md | 16 ++++++++++ doc/DISCLAIMER.md | 52 ++++++++++++++++++++++++++++++ doc/DISCLAIMER_fr.md | 53 ++++++++++++++++++++++++++++++ manifest.json | 8 +++++ scripts/install | 2 -- 6 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 doc/DISCLAIMER.md create mode 100644 doc/DISCLAIMER_fr.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000..2729a6b --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,55 @@ +--- +name: Bug report +about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.* + - *When in doubt, post here and we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +### Describe the bug + +*A clear and concise description of what the bug is.* + +### Context + +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +### Steps to reproduce + +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install the_app + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '...'* + 3. *Scroll down to '...'* + 4. *See error* + +### Expected behavior + +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +### Logs + +*When an operation fails, YunoHost provides a simple way to share the logs.* +- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.* +- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.* + +*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)* + +*If applicable and useful, add screenshots to help explain your problem.* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..ef70e18 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,16 @@ +## Problem + +- *Description of why you made this PR* + +## Solution + +- *And how do you fix that problem* + +## PR Status + +- [ ] Code finished and ready to be reviewed/tested +- [ ] The fix/enhancement were manually tested (if applicable) + +## Automatic tests + +Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization) diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..7ffbd46 --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,52 @@ +## Configuration + +You can extend - or even override - the Roundcube configuration which is coming with this package in the file `conf/local.inc.php`. Do not edit the file `conf/config.inc.php` as future upgrades will overwrite it. + +## YunoHost specific features + +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. + +#### Multi-users support + +* Integrate with YunoHost users and SSO - i.e logout button, YunoHost users search + +#### Plugins + +You can also install other plugins - which will not be removed with upgrades. To do so, you can use the official [Plugin Repository](https://plugins.roundcube.net/). + +##### 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. + +1. Connect to your server as root using SSH: + ``` + $ ssh admin@1.2.3.4 + $ sudo -i + ``` + +2. Log in as the `roundcube` user - which owns the roundcube directory - and navigate in it: + ``` + # su -s /bin/bash - roundcube + $ cd /var/www/roundcube + ``` + +3. Install the plugin you want using composer - note that you have to specify *kitist/html5_notifier* and not only *html5_notifier*: + ``` + $ COMPOSER_HOME=./.composer php composer.phar require "kitist/html5_notifier" + ``` + +4. Enable it in the local configuration file `conf/local.inc.php` using your favorite text editor by adding: + ``` + Date: Fri, 28 May 2021 20:06:54 +0000 Subject: [PATCH 25/78] Auto-update README --- README.md | 56 +++++++++++++++++++++------------------------------- README_fr.md | 56 +++++++++++++++++++--------------------------------- 2 files changed, 42 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 5cdb60a..901c7e6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,8 @@ + + # 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) @@ -5,31 +10,23 @@ *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install Roundcube quickly and simply on a YunoHost server. -If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.* +> *This package allows you to install Roundcube 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 -[Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. -**Shipped version:** 1.5.0 +Open Source Webmail software -## Screenshots +**Shipped version:** 1.5.0~ynh1 -![](https://roundcube.net/screens/skins/elastic/desktop/screens/mailbox_widescreen.png) +**Demo:** https://demo.yunohost.org/webmail/ -## Demo - -* [YunoHost demo](https://demo.yunohost.org/webmail/) +## Disclaimers / important information ## Configuration You can extend - or even override - the Roundcube configuration which is coming with this package in the file `conf/local.inc.php`. Do not edit the file `conf/config.inc.php` as future upgrades will overwrite it. -## Documentation - - * Official documentation: https://github.com/roundcube/roundcubemail/wiki - * YunoHost documentation: https://yunohost.org/en/app_roundcube - ## YunoHost specific features In addition to Roundcube core features, the following are made available with this package: @@ -42,17 +39,6 @@ In addition to Roundcube core features, the following are made available with th * Integrate with YunoHost users and SSO - i.e logout button, YunoHost users search -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) - -## Limitations - -* No known limitations. - -## Additional information - #### Plugins You can also install other plugins - which will not be removed with upgrades. To do so, you can use the official [Plugin Repository](https://plugins.roundcube.net/). @@ -90,18 +76,18 @@ Note that you should also check the plugin homepage for additional installation You can also download the plugin and put it under the `plugins/` directory. In this case, do not forget to change ownerships of this folder to `roundcube`. -## Links +## Documentation and resources - * Report a bug: https://github.com/YunoHost-Apps/roundcube_ynh/issues - * Roundcube website: https://roundcube.net/ - * Roundcube repository: https://github.com/roundcube/roundcubemail - * YunoHost website: https://yunohost.org/ +* Official app website: https://example.com +* Official user documentation: https://yunohost.org/en/app_roundcube +* 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 ---- +## Developer info -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing). +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. ``` @@ -109,3 +95,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/te 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 diff --git a/README_fr.md b/README_fr.md index 2ccf883..5ed90d3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,35 +1,28 @@ # Roundcube pour 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) +[![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) [![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)* +*[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, consultez [le guide](https://yunohost.org/install) pour apprendre comment l'installer.* +> *This package allows you to install Roundcube 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 -[Roundcube](https://roundcube.net/) est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application. +## Vue d'ensemble -**Shipped version:** 1.5.0 +Webmail Open Source -## Screenshots +**Version incluse:** 1.5.0~ynh1 -![](https://roundcube.net/screens/skins/elastic/desktop/screens/mailbox_widescreen.png) +**Démo :** https://demo.yunohost.org/webmail/ -## Démo - -* [Démo YunoHost](https://demo.yunohost.org/webmail/) +## Avertissements / informations importantes ## Configuration Vous pouvez étendre (ou même remplacer) la configuration de Roundcube fournie avec ce paquet dans le fichier `conf/local.inc.php`. Ne modifiez pas le fichier `conf/config.inc.php` car les futures mises à jour le remplaceront. -## Documentation - - * Documentation officielle : https://github.com/roundcube/roundcubemail/wiki - * Documentation YunoHost : https://yunohost.org/fr/app_roundcube - ## Caractéristiques spécifiques YunoHost En plus des fonctionnalités principales de Roundcube, les éléments suivants sont disponibles avec ce paquet : @@ -43,17 +36,6 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * Intégration avec les utilisateurs YunoHost et SSO - c'est-à-dire le bouton de déconnexion, reconnaissance des autres utilisateurs de l'instance YunoHost. -#### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps.yunohost.org/ci/apps/roundcube/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/roundcube.svg)](https://ci-apps-arm.yunohost.org/ci/apps/roundcube/) - -## Limitations - -* Aucune limitation connue. - -## Additional information - #### Plugins Vous pouvez également installer d'autres plugins (qui ne seront pas supprimés avec les mises à niveau). Pour cela, vous pouvez utiliser le [Plugin Repository](https://plugins.roundcube.net/) officiel. @@ -91,14 +73,14 @@ Notez que vous devez également consulter la page d'accueil du plugin pour conna Vous pouvez également télécharger le plugin et le placer dans le répertoire `plugins /`. Dans ce cas, n'oubliez pas de changer la propriété de ce dossier en `roundcube`. -## Liens +## Documentations et ressources - * Signaler un bug : https://github.com/YunoHost-Apps/roundcube_ynh/issues - * Site de l'application : https://roundcube.net/ - * Dépôt de l'application principale : https://github.com/roundcube/roundcubemail - * Site web YunoHost : https://yunohost.org/ - ---- +* Site officiel de l'app : https://example.com +* Documentation officielle utilisateur : https://yunohost.org/en/app_roundcube +* 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 ## Informations pour les développeurs @@ -107,6 +89,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug -ou +or 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 From c3a52acb1f3a24b9f71cb985bad813696804fb99 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 28 May 2021 22:15:40 +0200 Subject: [PATCH 26/78] Delete pull_request_template.md --- pull_request_template.md | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md deleted file mode 100644 index 0a198cf..0000000 --- a/pull_request_template.md +++ /dev/null @@ -1,16 +0,0 @@ -## Problem -- *Description of why you made this PR* - -## Solution -- *And how you fix that* - -## PR Status -- [ ] Code finished. -- [ ] Tested with Package_check. -- [ ] Fix or enhancement tested. -- [ ] Upgrade from last version tested. -- [ ] Can be reviewed and tested. - -## Package_check results ---- -* An automatic package_check will be launch at https://ci-apps-dev.yunohost.org/, when you add a specific comment to your Pull Request: "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!"* From 727639deb95b6b9a2b069d7a75af87c6c76d9aa6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 4 Jun 2021 16:09:37 +0200 Subject: [PATCH 27/78] Fix --- check_process | 6 ++++++ scripts/_common.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/check_process b/check_process index c059b34..a3abefc 100644 --- a/check_process +++ b/check_process @@ -12,9 +12,15 @@ setup_private=0 setup_public=0 upgrade=1 + upgrade=1 from_commit=67cb9813b18254b5f478d9a2974862d0a3af40e5 backup_restore=1 multi_instance=1 change_url=1 ;;; Options Email= Notification=none +;;; Upgrade options + ; commit=67cb9813b18254b5f478d9a2974862d0a3af40e5 + name=Merge pull request #108 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + diff --git a/scripts/_common.sh b/scripts/_common.sh index 4805d20..60dff8b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -10,7 +10,7 @@ YNH_PHP_VERSION="7.3" extra_php_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.0.11 +YNH_COMPOSER_VERSION=2.1.1 # Plugins version contextmenu_version=2.3 From e23df49ac4009247d859317e0d31d3777b9ec1da Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 4 Jun 2021 14:09:45 +0000 Subject: [PATCH 28/78] Auto-update README --- README.md | 2 +- README_fr.md | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 901c7e6..8c15d4a 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ You can also download the plugin and put it under the `plugins/` directory. In t * Official app website: https://example.com * Official user documentation: https://yunohost.org/en/app_roundcube * Official admin documentation: https://github.com/roundcube/roundcubemail/wiki -* Upstream app code repository: https://github.com/roundcube/roundcubemail +* 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 diff --git a/README_fr.md b/README_fr.md index 5ed90d3..6876896 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,16 +6,16 @@ *[Read this readme in english.](./README.md)* *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Roundcube 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.* +> *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.* ## Vue d'ensemble Webmail Open Source -**Version incluse:** 1.5.0~ynh1 +**Version incluse :** 1.5.0~ynh1 -**Démo :** https://demo.yunohost.org/webmail/ +**Démo :** https://demo.yunohost.org/webmail/ ## Avertissements / informations importantes @@ -75,12 +75,12 @@ Vous pouvez également télécharger le plugin et le placer dans le répertoire ## Documentations et ressources -* Site officiel de l'app : https://example.com -* Documentation officielle utilisateur : https://yunohost.org/en/app_roundcube -* 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 : https://example.com +* Documentation officielle utilisateur : https://yunohost.org/en/app_roundcube +* 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 ## Informations pour les développeurs @@ -89,8 +89,8 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/roundcube_ynh/tree/testing --debug -or +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 :** https://yunohost.org/packaging_apps \ No newline at end of file From dbc4f5e1d258c3ccacaa11d0aec665d5f8e71e88 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 8 Jun 2021 14:04:30 +0200 Subject: [PATCH 29/78] Fix --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b80070e..d32dc12 100644 --- a/scripts/install +++ b/scripts/install @@ -212,7 +212,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& # Update javascript dependencies (cd "$final_path" -/usr/bin/php -q ./bin/install-jsdeps.sh) +/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" diff --git a/scripts/upgrade b/scripts/upgrade index 82898a4..cd16af4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -260,7 +260,7 @@ then # Update JavaScript dependencies (cd "$final_path" - /usr/bin/php -q ./bin/install-jsdeps.sh) + /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) # Store the config file checksum into the app settings ynh_store_file_checksum --file="$final_path/config/config.inc.php" From 054dc5ec5303a4acb8cdf7ab0bdd58ac4729092a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 12:08:37 +0200 Subject: [PATCH 30/78] Add ynh_add_config --- scripts/install | 11 +++-------- scripts/upgrade | 12 +++--------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/scripts/install b/scripts/install index d32dc12..939842b 100644 --- a/scripts/install +++ b/scripts/install @@ -126,14 +126,9 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -rc_conf="$final_path/config/config.inc.php" - -cp ../conf/config.inc.php "$rc_conf" - -ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" +file="__FILE__" +deskey="$(ynh_string_random --length=24)" +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index cd16af4..1adbb85 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,15 +156,9 @@ then rc_conf="$final_path/config/config.inc.php" - # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$rc_conf" - - cp ../conf/config.inc.php "$rc_conf" - - ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + file="__FILE__" + deskey="$(ynh_string_random --length=24)" + ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER From 530b2825447857d209259d2fd164721210b60518 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 15:15:59 +0200 Subject: [PATCH 31/78] PHP8 --- scripts/restore | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 4efc074..ec225ed 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION #================================================= # CHECK IF THE APP CAN BE RESTORED diff --git a/scripts/upgrade b/scripts/upgrade index 1adbb85..939bf61 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name with_carddav=$(ynh_app_setting_get --app=$app --key=with_carddav) with_enigma=$(ynh_app_setting_get --app=$app --key=with_enigma) -phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION language=$(ynh_app_setting_get --app=$app --key=language) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) From bb39ff211a93d7eca2936e52ab6460d990c2433e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 15:30:13 +0200 Subject: [PATCH 32/78] 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 60dff8b..ebe3eb2 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 extra_php_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" From e32ef76923dc3231799612170aa42eb20c850809 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 16:20:01 +0200 Subject: [PATCH 33/78] Update backup --- scripts/backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index 6f4f9c1..3167c87 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_app_setting_get --app=$app --key=phpversion) +phpversion=$YNH_PHP_VERSION #================================================= # DECLARE DATA AND CONF FILES TO BACKUP From a523048d5c157cfdd0454d06d0f5bf4fe56f3af7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 17:45:28 +0200 Subject: [PATCH 34/78] Revert "Add ynh_add_config" This reverts commit 054dc5ec5303a4acb8cdf7ab0bdd58ac4729092a. --- scripts/install | 11 ++++++++--- scripts/upgrade | 12 +++++++++--- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 939842b..d32dc12 100644 --- a/scripts/install +++ b/scripts/install @@ -126,9 +126,14 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." -file="__FILE__" -deskey="$(ynh_string_random --length=24)" -ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" +rc_conf="$final_path/config/config.inc.php" + +cp ../conf/config.inc.php "$rc_conf" + +ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS diff --git a/scripts/upgrade b/scripts/upgrade index 939bf61..7362176 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,9 +156,15 @@ then rc_conf="$final_path/config/config.inc.php" - file="__FILE__" - deskey="$(ynh_string_random --length=24)" - ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" + # Verify the checksum and backup the file if it's different + ynh_backup_if_checksum_is_different "$rc_conf" + + cp ../conf/config.inc.php "$rc_conf" + + ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER From 09674492ba55f534594673af79f11c481bb7d081 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 19:41:36 +0200 Subject: [PATCH 35/78] Revert "PHP8" This reverts commit 530b2825447857d209259d2fd164721210b60518. --- scripts/restore | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index ec225ed..4efc074 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,7 @@ path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED diff --git a/scripts/upgrade b/scripts/upgrade index 7362176..cd16af4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -23,7 +23,7 @@ db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name with_carddav=$(ynh_app_setting_get --app=$app --key=with_carddav) with_enigma=$(ynh_app_setting_get --app=$app --key=with_enigma) -phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) language=$(ynh_app_setting_get --app=$app --key=language) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) From 60c71794ef46d41796829c1bb67dc4ee01de4948 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 12 Jun 2021 19:41:48 +0200 Subject: [PATCH 36/78] 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 ebe3eb2..60dff8b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="8.0" +YNH_PHP_VERSION="7.3" # Package dependencies extra_php_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" From 7438caedb3164e57fb2434bb4459e350caa85d31 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Jul 2021 22:48:00 +0200 Subject: [PATCH 37/78] Update app.src --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 3c7baac..b2192a2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5-beta/roundcubemail-1.5-beta.tar.gz -SOURCE_SUM=d42f19510d4c1996ff1e6d9c50e018c8af7faa464c329d9e2faf7a363b12cbd4 +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5-rc/roundcubemail-1.5-rc.tar.gz +SOURCE_SUM=e5386d09c138d0b15e5a0d07189c3836f55cd25d5c4fcec40946fa5da2c4e3cd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 1d7cd8bb9824b0c66f9c9360c4df3f4e2f64bafe Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 19:02:25 +0200 Subject: [PATCH 38/78] 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 60dff8b..4d6980c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -13,7 +13,7 @@ extra_php_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION YNH_COMPOSER_VERSION=2.1.1 # Plugins version -contextmenu_version=2.3 +contextmenu_version=3.2.1 automatic_addressbook_version=v0.4.3 carddav_version=3.0.3 From 51efcc260400b42b2ec5c98e616cc73bd5c71315 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 19:07:25 +0200 Subject: [PATCH 39/78] Add_config --- scripts/install | 16 ++++------------ scripts/upgrade | 19 ++++--------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/scripts/install b/scripts/install index d32dc12..df52b9d 100644 --- a/scripts/install +++ b/scripts/install @@ -124,16 +124,11 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= # CONFIGURE ROUNDCUBE #================================================= -ynh_script_progression --message="Configuring Roundcube..." +ynh_script_progression --message="Configuring Roundcube..." --weight=2 -rc_conf="$final_path/config/config.inc.php" - -cp ../conf/config.inc.php "$rc_conf" - -ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" +file="__FILE__" +deskey=$(ynh_string_random --length=24) +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # INSTALL ADDITIONAL PLUGINS @@ -214,9 +209,6 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& (cd "$final_path" /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) -# Store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/config/config.inc.php" - chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" diff --git a/scripts/upgrade b/scripts/upgrade index cd16af4..93a7935 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,19 +152,11 @@ ynh_add_fpm_config --package="$extra_php_dependencies" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Reconfiguring Roundcube..." + ynh_script_progression --message="Reconfiguring Roundcube..." --weight=3 - rc_conf="$final_path/config/config.inc.php" - - # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$rc_conf" - - cp ../conf/config.inc.php "$rc_conf" - - ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + file="__FILE__" + deskey=$(ynh_string_random --length=24) + ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER @@ -262,9 +254,6 @@ then (cd "$final_path" /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) - # Store the config file checksum into the app settings - ynh_store_file_checksum --file="$final_path/config/config.inc.php" - chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" From 80d82e205e29d37aa2202a1c8639858cae719548 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 19:19:23 +0200 Subject: [PATCH 40/78] Update config.inc.php --- conf/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index 4012e33..24fd0b8 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -193,7 +193,7 @@ $config['ldapAliasSync'] = array( // LOCAL CONFIGURATION // ---------------------------------- -$local_config = dirname(__FILE__) . '/local.inc.php'; +$local_config = dirname(__FILE__) . 'local.inc.php'; if (file_exists($local_config)) { include $local_config; } From 38c348291df5dff79415395991844b59a0388439 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 19:20:42 +0200 Subject: [PATCH 41/78] Revert "Add_config" This reverts commit 51efcc260400b42b2ec5c98e616cc73bd5c71315. --- scripts/install | 16 ++++++++++++---- scripts/upgrade | 19 +++++++++++++++---- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index df52b9d..d32dc12 100644 --- a/scripts/install +++ b/scripts/install @@ -124,11 +124,16 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= # CONFIGURE ROUNDCUBE #================================================= -ynh_script_progression --message="Configuring Roundcube..." --weight=2 +ynh_script_progression --message="Configuring Roundcube..." -file="__FILE__" -deskey=$(ynh_string_random --length=24) -ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" +rc_conf="$final_path/config/config.inc.php" + +cp ../conf/config.inc.php "$rc_conf" + +ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" +ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # INSTALL ADDITIONAL PLUGINS @@ -209,6 +214,9 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& (cd "$final_path" /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) +# Store the config file checksum into the app settings +ynh_store_file_checksum --file="$final_path/config/config.inc.php" + chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" diff --git a/scripts/upgrade b/scripts/upgrade index 93a7935..cd16af4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,11 +152,19 @@ ynh_add_fpm_config --package="$extra_php_dependencies" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Reconfiguring Roundcube..." --weight=3 + ynh_script_progression --message="Reconfiguring Roundcube..." - file="__FILE__" - deskey=$(ynh_string_random --length=24) - ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" + rc_conf="$final_path/config/config.inc.php" + + # Verify the checksum and backup the file if it's different + ynh_backup_if_checksum_is_different "$rc_conf" + + cp ../conf/config.inc.php "$rc_conf" + + ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" + ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" + ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER @@ -254,6 +262,9 @@ then (cd "$final_path" /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) + # Store the config file checksum into the app settings + ynh_store_file_checksum --file="$final_path/config/config.inc.php" + chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" From a531608dff7c0fef223b56e0f58f37c773e7080e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 19:21:24 +0200 Subject: [PATCH 42/78] Update config.inc.php --- conf/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index 24fd0b8..4012e33 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -193,7 +193,7 @@ $config['ldapAliasSync'] = array( // LOCAL CONFIGURATION // ---------------------------------- -$local_config = dirname(__FILE__) . 'local.inc.php'; +$local_config = dirname(__FILE__) . '/local.inc.php'; if (file_exists($local_config)) { include $local_config; } From c5201c847c5849a4c633e894bdacc4571b917592 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 20:11:30 +0200 Subject: [PATCH 43/78] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index ba4d3dc..e4d446d 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "https://roundcube.net/", "upstream": { "license": "GPL-3.0-only", - "website": "https://example.com", + "website": "https://roundcube.net/", "demo": "https://demo.yunohost.org/webmail/", "admindoc": "https://github.com/roundcube/roundcubemail/wiki", "userdoc": "https://yunohost.org/en/app_roundcube", From 488f3374b74240ae3a4795661c3e2c5b46569e8d Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 18 Aug 2021 18:11:35 +0000 Subject: [PATCH 44/78] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8c15d4a..6831264 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ You can also download the plugin and put it under the `plugins/` directory. In t ## Documentation and resources -* Official app website: https://example.com +* Official app website: https://roundcube.net/ * Official user documentation: https://yunohost.org/en/app_roundcube * Official admin documentation: https://github.com/roundcube/roundcubemail/wiki * Upstream app code repository: https://github.com/roundcube/roundcubemail diff --git a/README_fr.md b/README_fr.md index 6876896..91f0812 100644 --- a/README_fr.md +++ b/README_fr.md @@ -75,7 +75,7 @@ Vous pouvez également télécharger le plugin et le placer dans le répertoire ## Documentations et ressources -* Site officiel de l'app : https://example.com +* Site officiel de l'app : https://roundcube.net/ * Documentation officielle utilisateur : https://yunohost.org/en/app_roundcube * 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 From 19dfc22780a29c2c2bf4cd00e581d940a25a319e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 21:04:01 +0200 Subject: [PATCH 45/78] Fix --- check_process | 3 +-- scripts/install | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index a3abefc..fde97b2 100644 --- a/check_process +++ b/check_process @@ -2,6 +2,7 @@ ; Manifest domain="domain.tld" path="/path" + language="en_GB" with_carddav=1 with_enigma=1 ; Checks @@ -22,5 +23,3 @@ Notification=none ;;; Upgrade options ; commit=67cb9813b18254b5f478d9a2974862d0a3af40e5 name=Merge pull request #108 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - diff --git a/scripts/install b/scripts/install index d32dc12..68d18a4 100644 --- a/scripts/install +++ b/scripts/install @@ -124,7 +124,7 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= # CONFIGURE ROUNDCUBE #================================================= -ynh_script_progression --message="Configuring Roundcube..." +ynh_script_progression --message="Configuring Roundcube..." --weight=2 rc_conf="$final_path/config/config.inc.php" From d1f938bef868e9d43fe7d9fdfd190d7d24ed459f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 21:46:27 +0200 Subject: [PATCH 46/78] Update upgrade --- scripts/upgrade | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index cd16af4..1528129 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,10 +33,24 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) upgrade_type=$(ynh_check_app_version_changed) +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=5 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 # If db_name doesn't exist, create it if [ -z "$db_name" ]; then @@ -85,24 +99,10 @@ if ynh_legacy_permissions_exists; then ynh_app_setting_delete --app=$app --key=is_public fi -#================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP -#================================================= -ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=30 - -# Backup the current version of the app -ynh_backup_before_upgrade -ynh_clean_setup () { - # restore it if the upgrade fails - ynh_restore_upgradebackup -} -# Exit if an error occurs during the execution of the script -ynh_abort_if_errors - #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Making sure dedicated system user exists..." +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 # Create a dedicated user (if not existing) ynh_system_user_create --username=$app --home_dir="$final_path" @@ -131,7 +131,7 @@ chown -R $app:www-data "$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config @@ -152,7 +152,7 @@ ynh_add_fpm_config --package="$extra_php_dependencies" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Reconfiguring Roundcube..." + ynh_script_progression --message="Reconfiguring Roundcube..." --weight=1 rc_conf="$final_path/config/config.inc.php" @@ -280,7 +280,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload From cb78e666f0f0ab245a768b0af772a4c59887ed9f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 18 Aug 2021 21:48:51 +0200 Subject: [PATCH 47/78] Fix --- scripts/install | 2 +- scripts/remove | 2 +- scripts/restore | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 68d18a4..0941ec1 100644 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_script_progression --message="Creating a MySQL database..." +ynh_script_progression --message="Creating a MySQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name diff --git a/scripts/remove b/scripts/remove index c409dac..031ebcc 100644 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." +ynh_script_progression --message="Loading installation settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME diff --git a/scripts/restore b/scripts/restore index 4efc074..b51aa04 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,7 +19,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." +ynh_script_progression --message="Loading settings..." --weight=1 app=$YNH_APP_INSTANCE_NAME @@ -59,7 +59,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_script_progression --message="Restoring $app main directory..." +ynh_script_progression --message="Restoring $app main directory..." --weight=4 ynh_restore_file --origin_path="$final_path" @@ -91,7 +91,7 @@ ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./ #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload From 33df5c706b34637c079442972e2f4ed5377d2614 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 21:49:49 +0200 Subject: [PATCH 48/78] Fix --- scripts/install | 13 ++++--------- scripts/upgrade | 3 +++ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 0941ec1..2c38845 100644 --- a/scripts/install +++ b/scripts/install @@ -201,6 +201,9 @@ then cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \ && installed_plugins+=" 'enigma'," \ || ynh_print_warn --message="Unable to install Enigma plugin" + + mkdir -p "$final_path/plugins/enigma/home" + chown -R $app: "$final_path/plugins/enigma/home" fi #================================================= @@ -218,15 +221,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& ynh_store_file_checksum --file="$final_path/config/config.inc.php" chmod 400 "$final_path/config/config.inc.php" -chown $app:$app "$final_path/config/config.inc.php" - -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -mkdir -p "$final_path/plugins/enigma/home" +chown $app: "$final_path/config/config.inc.php" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 1528129..6dfa8f8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -249,6 +249,9 @@ then cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \ && installed_plugins+=" 'enigma'," \ || ynh_print_warn --message="Unable to install Enigma plugin" + + mkdir -p "$final_path/plugins/enigma/home" + chown -R $app: "$final_path/plugins/enigma/home" fi #================================================= From c128f6e704f420ab8480524354520ecdc7465797 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 22:11:23 +0200 Subject: [PATCH 49/78] Revert "Fix" This reverts commit 33df5c706b34637c079442972e2f4ed5377d2614. --- scripts/install | 13 +++++++++---- scripts/upgrade | 3 --- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 2c38845..0941ec1 100644 --- a/scripts/install +++ b/scripts/install @@ -201,9 +201,6 @@ then cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \ && installed_plugins+=" 'enigma'," \ || ynh_print_warn --message="Unable to install Enigma plugin" - - mkdir -p "$final_path/plugins/enigma/home" - chown -R $app: "$final_path/plugins/enigma/home" fi #================================================= @@ -221,7 +218,15 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& ynh_store_file_checksum --file="$final_path/config/config.inc.php" chmod 400 "$final_path/config/config.inc.php" -chown $app: "$final_path/config/config.inc.php" +chown $app:$app "$final_path/config/config.inc.php" + +#================================================= +# GENERIC FINALIZATION +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= + +mkdir -p "$final_path/plugins/enigma/home" #================================================= # RELOAD NGINX diff --git a/scripts/upgrade b/scripts/upgrade index 6dfa8f8..1528129 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -249,9 +249,6 @@ then cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \ && installed_plugins+=" 'enigma'," \ || ynh_print_warn --message="Unable to install Enigma plugin" - - mkdir -p "$final_path/plugins/enigma/home" - chown -R $app: "$final_path/plugins/enigma/home" fi #================================================= From 88be015884fe5283877e6916e6b1ad0d5a254f53 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 22:12:45 +0200 Subject: [PATCH 50/78] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 0941ec1..3427945 100644 --- a/scripts/install +++ b/scripts/install @@ -227,6 +227,7 @@ chown $app:$app "$final_path/config/config.inc.php" #================================================= mkdir -p "$final_path/plugins/enigma/home" +chown -R $app:$app "$final_path/plugins/enigma/home" #================================================= # RELOAD NGINX From 0a9177653474ab46e8283ca848d07007fb2b6f36 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 22:18:55 +0200 Subject: [PATCH 51/78] Update install --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 3427945..785f913 100644 --- a/scripts/install +++ b/scripts/install @@ -227,7 +227,8 @@ chown $app:$app "$final_path/config/config.inc.php" #================================================= mkdir -p "$final_path/plugins/enigma/home" -chown -R $app:$app "$final_path/plugins/enigma/home" +#chown -R $app:$app "$final_path/plugins/enigma/home" +chown -R $app:www-data "$final_path/plugins" #================================================= # RELOAD NGINX From 978f631c346f9688596df25a7072fdb476c93f60 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 22:55:55 +0200 Subject: [PATCH 52/78] Update config.inc.php --- conf/config.inc.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/config.inc.php b/conf/config.inc.php index 4012e33..d80ffa9 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -141,6 +141,8 @@ $config['plugins'] = array( 'markasjunk', 'new_user_dialog', 'new_user_identity', + 'carddav', + 'enigma', // installed plugins ); From 8d37422198dee636222c25ee48da080102c6c8bd Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 22:59:49 +0200 Subject: [PATCH 53/78] Update config.inc.php --- conf/config.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index d80ffa9..afc7ec6 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -141,7 +141,6 @@ $config['plugins'] = array( 'markasjunk', 'new_user_dialog', 'new_user_identity', - 'carddav', 'enigma', // installed plugins ); From fe55c998a583ef6397a33ea2fae605e032e35f2a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 10:17:09 +0200 Subject: [PATCH 54/78] Fix --- conf/enigma.config.inc.php | 2 +- scripts/install | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/conf/enigma.config.inc.php b/conf/enigma.config.inc.php index 4804bfb..8990189 100644 --- a/conf/enigma.config.inc.php +++ b/conf/enigma.config.inc.php @@ -14,7 +14,7 @@ $config['enigma_debug'] = false; // REQUIRED! Keys directory for all users. // Must be writeable by PHP process, and not in the web server document root -$config['enigma_pgp_homedir'] = '__DIR__'; +$config['enigma_pgp_homedir'] = '__FINALPATH__/plugins/enigma/home'; // Location of gpg binary. By default it will be auto-detected. // This is also a way to force gpg2 use if there are both 1.x and 2.x on the system. diff --git a/scripts/install b/scripts/install index 785f913..ae0f96c 100644 --- a/scripts/install +++ b/scripts/install @@ -184,7 +184,7 @@ then done done - # Do not actualy add the cardDAV plugin if there's no carddav server available... + # Do not actualy add the cardDAV plugin if there's no cardDAV server available... if [ $carddav_server -eq 1 ] then installed_plugins+=" 'carddav'," @@ -194,13 +194,11 @@ fi # Install Enigma plugin if [ $with_enigma -eq 1 ] then - enigma_tmp_config="../conf/enigma.config.inc.php" + ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" + installed_plugins+=" 'enigma'," || ynh_print_warn --message="Unable to install Enigma plugin" - ynh_replace_string --match_string="__DIR__" --replace_string="$final_path/plugins/enigma/home" --target_file="$enigma_tmp_config" - - cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \ - && installed_plugins+=" 'enigma'," \ - || ynh_print_warn --message="Unable to install Enigma plugin" + mkdir -p "$final_path/plugins/enigma/home" + chown -R $app:$app "$final_path/plugins/enigma/home" fi #================================================= @@ -226,9 +224,14 @@ chown $app:$app "$final_path/config/config.inc.php" # SECURE FILES AND DIRECTORIES #================================================= +<<<<<<< Updated upstream mkdir -p "$final_path/plugins/enigma/home" #chown -R $app:$app "$final_path/plugins/enigma/home" chown -R $app:www-data "$final_path/plugins" +======= +#mkdir -p "$final_path/plugins/enigma/home" +#chown -R $app:$app "$final_path/plugins/enigma/home" +>>>>>>> Stashed changes #================================================= # RELOAD NGINX From facd75b4ac1786d3062026ce17ab86080d3f1b9e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 10:19:00 +0200 Subject: [PATCH 55/78] Fix --- scripts/install | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/scripts/install b/scripts/install index ae0f96c..b309803 100644 --- a/scripts/install +++ b/scripts/install @@ -220,19 +220,6 @@ chown $app:$app "$final_path/config/config.inc.php" #================================================= # GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= - -<<<<<<< Updated upstream -mkdir -p "$final_path/plugins/enigma/home" -#chown -R $app:$app "$final_path/plugins/enigma/home" -chown -R $app:www-data "$final_path/plugins" -======= -#mkdir -p "$final_path/plugins/enigma/home" -#chown -R $app:$app "$final_path/plugins/enigma/home" ->>>>>>> Stashed changes - #================================================= # RELOAD NGINX #================================================= From e07a21335a064bab09c628b58a694535a0ac3e97 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 10:56:58 +0200 Subject: [PATCH 56/78] Update config.inc.php --- conf/config.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index afc7ec6..4012e33 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -141,7 +141,6 @@ $config['plugins'] = array( 'markasjunk', 'new_user_dialog', 'new_user_identity', - 'enigma', // installed plugins ); From cabc11fc918c2c56f75b3fde77bb24f6561a7e0d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 11:52:13 +0200 Subject: [PATCH 57/78] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index b309803..ea34410 100644 --- a/scripts/install +++ b/scripts/install @@ -153,7 +153,7 @@ ynh_composer_exec --commands="require \ johndoh/contextmenu $contextmenu_version \ sblaisot/automatic_addressbook $automatic_addressbook_version" -installed_plugins+=" 'contextmenu', 'automatic_addressbook'," +installed_plugins=" 'contextmenu', 'automatic_addressbook'," # Install CardDAV plugin if [ $with_carddav -eq 1 ] From 74f6c3c44ab557fe3dd54cc223daa0b4f8717fd9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 12:09:03 +0200 Subject: [PATCH 58/78] Add enigma by default --- check_process | 1 - manifest.json | 9 --------- scripts/install | 18 +++++------------- scripts/upgrade | 30 +++++------------------------- 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/check_process b/check_process index fde97b2..399421a 100644 --- a/check_process +++ b/check_process @@ -4,7 +4,6 @@ path="/path" language="en_GB" with_carddav=1 - with_enigma=1 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index e4d446d..fbfe0f2 100644 --- a/manifest.json +++ b/manifest.json @@ -61,15 +61,6 @@ "fr": "Installer le plugin de synchronisation CardDAV ?" }, "default": false - }, - { - "name": "with_enigma", - "type": "boolean", - "ask": { - "en": "Install Enigma messages encryption plugin?", - "fr": "Installer le plugin de chiffrement des messages Enigma ?" - }, - "default": false } ] } diff --git a/scripts/install b/scripts/install index ea34410..02a6bca 100644 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH with_carddav=$YNH_APP_ARG_WITH_CARDDAV -with_enigma=$YNH_APP_ARG_WITH_ENIGMA language=$YNH_APP_ARG_LANGUAGE app=$YNH_APP_INSTANCE_NAME @@ -47,7 +46,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 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=with_carddav --value=$with_carddav -ynh_app_setting_set --app=$app --key=with_enigma --value=$with_enigma ynh_app_setting_set --app=$app --key=language --value=$language #================================================= @@ -153,7 +151,11 @@ ynh_composer_exec --commands="require \ johndoh/contextmenu $contextmenu_version \ sblaisot/automatic_addressbook $automatic_addressbook_version" -installed_plugins=" 'contextmenu', 'automatic_addressbook'," +installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'enigma'," + +ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" +mkdir -p "$final_path/plugins/enigma/home" +chown -R $app:$app "$final_path/plugins/enigma/home" # Install CardDAV plugin if [ $with_carddav -eq 1 ] @@ -191,16 +193,6 @@ then fi fi -# Install Enigma plugin -if [ $with_enigma -eq 1 ] -then - ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" - installed_plugins+=" 'enigma'," || ynh_print_warn --message="Unable to install Enigma plugin" - - mkdir -p "$final_path/plugins/enigma/home" - chown -R $app:$app "$final_path/plugins/enigma/home" -fi - #================================================= # UPDATE ROUNDCUBE CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 1528129..b35e024 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -22,7 +22,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name with_carddav=$(ynh_app_setting_get --app=$app --key=with_carddav) -with_enigma=$(ynh_app_setting_get --app=$app --key=with_enigma) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) language=$(ynh_app_setting_get --app=$app --key=language) db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) @@ -75,17 +74,6 @@ if [ -z "$with_carddav" ]; then ynh_app_setting_set --app=$app --key=with_carddav --value=$with_carddav fi -# If with_enigma doesn't exist, create it -if [ -z "$with_enigma" ]; then - if [ -f "${final_path}/plugins/enigma/config.inc.php" ] - then - with_enigma=1 - else - with_enigma=0 - fi - ynh_app_setting_set --app=$app --key=with_enigma --value=$with_enigma -fi - # If language doesn't exist, create it if [ -z "$language" ]; then language="en_GB" @@ -201,7 +189,11 @@ then johndoh/contextmenu $contextmenu_version \ sblaisot/automatic_addressbook $automatic_addressbook_version" - installed_plugins+=" 'contextmenu', 'automatic_addressbook'," + installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'enigma'," + + ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" + mkdir -p "$final_path/plugins/enigma/home" + chown -R $app:$app "$final_path/plugins/enigma/home" # Update or install CardDAV plugin if [ $with_carddav -eq 1 ] @@ -239,18 +231,6 @@ then fi fi - # Install Enigma plugin - if [ $with_enigma -eq 1 ] - then - enigma_tmp_config="../conf/enigma.config.inc.php" - - ynh_replace_string --match_string="__DIR__" --replace_string="$final_path/plugins/enigma/home" --target_file="$enigma_tmp_config" - - cp "$enigma_tmp_config" "$final_path/plugins/enigma/config.inc.php" \ - && installed_plugins+=" 'enigma'," \ - || ynh_print_warn --message="Unable to install Enigma plugin" - fi - #================================================= # UPDATE ROUNDCUBE CONFIGURATION #================================================= From 6c679c8732194847ca42eb1afb4fba6d0ad5ec37 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 12:15:31 +0200 Subject: [PATCH 59/78] Fix --- conf/config.inc.php | 1 + scripts/install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index 4012e33..afc7ec6 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -141,6 +141,7 @@ $config['plugins'] = array( 'markasjunk', 'new_user_dialog', 'new_user_identity', + 'enigma', // installed plugins ); diff --git a/scripts/install b/scripts/install index 02a6bca..21afeee 100644 --- a/scripts/install +++ b/scripts/install @@ -151,7 +151,7 @@ ynh_composer_exec --commands="require \ johndoh/contextmenu $contextmenu_version \ sblaisot/automatic_addressbook $automatic_addressbook_version" -installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'enigma'," +installed_plugins+=" 'contextmenu', 'automatic_addressbook'," ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" mkdir -p "$final_path/plugins/enigma/home" From bc9a2c0cb99daaa196363c8fa999444fd8b4cc3c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 12:18:01 +0200 Subject: [PATCH 60/78] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index b35e024..0f9b3c8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -189,7 +189,7 @@ then johndoh/contextmenu $contextmenu_version \ sblaisot/automatic_addressbook $automatic_addressbook_version" - installed_plugins+=" 'contextmenu', 'automatic_addressbook', 'enigma'," + installed_plugins+=" 'contextmenu', 'automatic_addressbook'," ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" mkdir -p "$final_path/plugins/enigma/home" From f744b9eeac4bd3a08466d4332ead1820eb951a81 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 12:38:16 +0200 Subject: [PATCH 61/78] Fix --- scripts/_common.sh | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4d6980c..c5ed229 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="7.3" # Package dependencies -extra_php_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" +extra_php_dependencies="php-crypt-gpg 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 diff --git a/scripts/install b/scripts/install index 21afeee..b0311ce 100644 --- a/scripts/install +++ b/scripts/install @@ -155,7 +155,7 @@ installed_plugins+=" 'contextmenu', 'automatic_addressbook'," ynh_add_config --template="../conf/enigma.config.inc.php" --destination="$final_path/plugins/enigma/config.inc.php" mkdir -p "$final_path/plugins/enigma/home" -chown -R $app:$app "$final_path/plugins/enigma/home" +chown -R $app:www-data "$final_path/plugins/enigma/home" # Install CardDAV plugin if [ $with_carddav -eq 1 ] From ef07c505aebbb82dbe845bd4d9f64ca472256cdc Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 13:13:39 +0200 Subject: [PATCH 62/78] 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 c5ed229..4d6980c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ YNH_PHP_VERSION="7.3" # Package dependencies -extra_php_dependencies="php-crypt-gpg 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" +extra_php_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 From b5c76e05be79f88fc027445e8973c86c7fe8c7a6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 13:22:23 +0200 Subject: [PATCH 63/78] Update install --- scripts/install | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index b0311ce..32cda0e 100644 --- a/scripts/install +++ b/scripts/install @@ -124,14 +124,16 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." --weight=2 -rc_conf="$final_path/config/config.inc.php" +#cp ../conf/config.inc.php "$final_path/config/config.inc.php" -cp ../conf/config.inc.php "$rc_conf" +#ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$final_path/config/config.inc.php" +#ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/config/config.inc.php" +#ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/config/config.inc.php" +#ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/config/config.inc.php" -ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" +desket=$(ynh_string_random --length=24) +file="__FILE__" +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # INSTALL ADDITIONAL PLUGINS From 2cb7aedbec1d0c884b1726f49c5971af0f2b2683 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 27 Aug 2021 14:11:30 +0200 Subject: [PATCH 64/78] Add description --- doc/DESCRIPTION.md | 1 + doc/DESCRIPTION_fr.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 doc/DESCRIPTION.md create mode 100644 doc/DESCRIPTION_fr.md diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md new file mode 100644 index 0000000..a38565a --- /dev/null +++ b/doc/DESCRIPTION.md @@ -0,0 +1 @@ +Roundcube is a browser-based multilingual IMAP client with an application-like user interface. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md new file mode 100644 index 0000000..5253eb1 --- /dev/null +++ b/doc/DESCRIPTION_fr.md @@ -0,0 +1 @@ +Roundcube est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application. \ No newline at end of file From 907143580198fee7185db1edd164a1a4662b8dec Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Fri, 27 Aug 2021 12:11:48 +0000 Subject: [PATCH 65/78] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6831264..9a07511 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Open Source Webmail software +Roundcube is a browser-based multilingual IMAP client with an application-like user interface. **Shipped version:** 1.5.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 91f0812..7b0269d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Webmail Open Source +Roundcube est un client IMAP multilingue basé sur un navigateur avec une interface utilisateur semblable à une application. **Version incluse :** 1.5.0~ynh1 From 8a7954a73dbdb2e285a7cbfd29a0a892e45e4d5d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Aug 2021 13:31:36 +0200 Subject: [PATCH 66/78] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 32cda0e..9a8e834 100644 --- a/scripts/install +++ b/scripts/install @@ -131,7 +131,7 @@ ynh_script_progression --message="Configuring Roundcube..." --weight=2 #ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/config/config.inc.php" #ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/config/config.inc.php" -desket=$(ynh_string_random --length=24) +deskey=$(ynh_string_random --length=24) file="__FILE__" ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" From 8ee006423870ba568f174644b61dfd2f0dba2922 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 Aug 2021 15:15:54 +0200 Subject: [PATCH 67/78] Fix --- doc/DESCRIPTION.md | 7 ++++++- doc/DISCLAIMER.md | 1 + doc/DISCLAIMER_fr.md | 1 + scripts/restore | 2 -- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index a38565a..39dc2ad 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1,6 @@ -Roundcube is a browser-based multilingual IMAP client with an application-like user interface. \ No newline at end of file +Roundcube is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality you expect from an email client, including MIME support, address book, folder manipulation, message searching and spell checking. + +### Features + +- CardDAV to connect with baïkal or Nextcloud +- Support for PGP encryption with Enigma plugin diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 7ffbd46..496009e 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -9,6 +9,7 @@ In addition to Roundcube core features, the following are made available with th * 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. +* Support for PGP encryption with Enigma plugin by default. #### Multi-users support diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 1389e7c..7ef82b3 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -10,6 +10,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * 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. +* Prise en charge du cryptage PGP avec le plugin Enigma installé par default. #### Support multi-utilisateur diff --git a/scripts/restore b/scripts/restore index b51aa04..9ae8cab 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,8 +35,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=3 -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 " From 3ee478d45bd5f6dc440f89c2ff94cf765f0c9c34 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 29 Aug 2021 13:16:02 +0000 Subject: [PATCH 68/78] Auto-update README --- README.md | 9 ++++++++- README_fr.md | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a07511..48aef69 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,13 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Roundcube is a browser-based multilingual IMAP client with an application-like user interface. +Roundcube is a browser-based multilingual IMAP client with an application-like user interface. It provides full functionality you expect from an email client, including MIME support, address book, folder manipulation, message searching and spell checking. + +### Features + +- CardDAV to connect with baïkal or Nextcloud +- Support for PGP encryption with Enigma plugin + **Shipped version:** 1.5.0~ynh1 @@ -34,6 +40,7 @@ In addition to Roundcube core features, the following are made available with th * 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. +* Support for PGP encryption with Enigma plugin by default. #### Multi-users support diff --git a/README_fr.md b/README_fr.md index 7b0269d..29ecb16 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,6 +31,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s * 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. +* Prise en charge du cryptage PGP avec le plugin Enigma installé par default. #### Support multi-utilisateur From 6f17e45e58927233e99f07441fd05dc9ad783ae5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 19 Sep 2021 10:08:20 +0200 Subject: [PATCH 69/78] Update manifest.json --- manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index fbfe0f2..4adfd3e 100644 --- a/manifest.json +++ b/manifest.json @@ -34,8 +34,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "domain.org" + "type": "domain" }, { "name": "path", From afb046ad48ead71442022465dc0b91750f1e239e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 18 Oct 2021 22:29:15 +0200 Subject: [PATCH 70/78] Upgrade to version 1.5 --- conf/app.src | 5 ++--- manifest.json | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index b2192a2..5274aea 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5-rc/roundcubemail-1.5-rc.tar.gz -SOURCE_SUM=e5386d09c138d0b15e5a0d07189c3836f55cd25d5c4fcec40946fa5da2c4e3cd +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.0/roundcubemail-1.5.0.tar.gz +SOURCE_SUM=f204b412f930ef6af9832d9afa95640803b7b94c3028450b0f94f56cdc4bbe1d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 4adfd3e..36440de 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,6 @@ "website": "https://roundcube.net/", "demo": "https://demo.yunohost.org/webmail/", "admindoc": "https://github.com/roundcube/roundcubemail/wiki", - "userdoc": "https://yunohost.org/en/app_roundcube", "code": "https://github.com/roundcube/roundcubemail" }, "license": "GPL-3.0-only", From b189835e97543a28621e4e33c0c21a2035119798 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 18 Oct 2021 20:29:26 +0000 Subject: [PATCH 71/78] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 48aef69..5e1b720 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,6 @@ 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 user documentation: https://yunohost.org/en/app_roundcube * 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 diff --git a/README_fr.md b/README_fr.md index 29ecb16..3136487 100644 --- a/README_fr.md +++ b/README_fr.md @@ -77,7 +77,6 @@ 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 utilisateur : https://yunohost.org/en/app_roundcube * 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 From 938df81422380f88fa95e41d0051b3a1048fe5b2 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 18 Oct 2021 23:01:24 +0200 Subject: [PATCH 72/78] Update config.inc.php --- conf/config.inc.php | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index afc7ec6..276a5da 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -53,7 +53,7 @@ $config['default_host'] = '%t'; // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %z - IMAP domain (IMAP hostname without the first part) // For example %n = mail.domain.tld, %t = domain.tld -// To specify differnt SMTP servers for different IMAP hosts provide an array +// 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; @@ -133,16 +133,15 @@ $config['ldap_public']['yunohost'] = array( // List of active plugins (in plugins/ directory) $config['plugins'] = array( - 'archive', - 'zipdownload', - // additionnal plugins - 'http_authentication', - 'managesieve', - 'markasjunk', - 'new_user_dialog', - 'new_user_identity', - 'enigma', - // installed plugins + 'archive', + 'zipdownload', + // additionnal plugins + 'http_authentication', + 'managesieve', + 'markasjunk', + 'new_user_dialog', + 'new_user_identity', + 'enigma', ); // ---------------------------------- @@ -190,11 +189,5 @@ $config['ldapAliasSync'] = array( ), ); -// ---------------------------------- -// LOCAL CONFIGURATION -// ---------------------------------- - -$local_config = dirname(__FILE__) . '/local.inc.php'; -if (file_exists($local_config)) { - include $local_config; -} +// skin name: folder from skins/ +$config['skin'] = 'elastic'; \ No newline at end of file From 762af6459d42d82777ab7417e432dce9d8659347 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Oct 2021 00:09:31 +0200 Subject: [PATCH 73/78] Fix --- conf/config.inc.php | 2 +- scripts/install | 8 -------- scripts/upgrade | 13 ++----------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/conf/config.inc.php b/conf/config.inc.php index 276a5da..7ec6bc2 100644 --- a/conf/config.inc.php +++ b/conf/config.inc.php @@ -190,4 +190,4 @@ $config['ldapAliasSync'] = array( ); // skin name: folder from skins/ -$config['skin'] = 'elastic'; \ No newline at end of file +$config['skin'] = 'elastic'; diff --git a/scripts/install b/scripts/install index 9a8e834..7644b6d 100644 --- a/scripts/install +++ b/scripts/install @@ -124,15 +124,7 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= ynh_script_progression --message="Configuring Roundcube..." --weight=2 -#cp ../conf/config.inc.php "$final_path/config/config.inc.php" - -#ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$final_path/config/config.inc.php" -#ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/config/config.inc.php" -#ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/config/config.inc.php" -#ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/config/config.inc.php" - deskey=$(ynh_string_random --length=24) -file="__FILE__" ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0f9b3c8..9c30e09 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -142,17 +142,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Reconfiguring Roundcube..." --weight=1 - rc_conf="$final_path/config/config.inc.php" - - # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$rc_conf" - - cp ../conf/config.inc.php "$rc_conf" - - ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + deskey=$(ynh_string_random --length=24) + ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER From a0aa5d144bbbc877ce54a61e90f0a5f744d51607 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Oct 2021 11:22:20 +0200 Subject: [PATCH 74/78] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9c30e09..873ec27 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,10 +112,6 @@ then ynh_setup_source --dest_dir="$final_path" fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # NGINX CONFIGURATION #================================================= @@ -248,6 +244,10 @@ then ynh_exec_warn ./bin/update.sh --version=$oldversion -y) fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # RELOAD NGINX #================================================= From 85a205f759bffc40baa83463a280417549c42215 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Oct 2021 11:35:29 +0200 Subject: [PATCH 75/78] Update upgrade --- scripts/upgrade | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 873ec27..7c0e305 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,7 +152,8 @@ then # Check if dependencies need to be updated with Composer if [ -f "$final_path/composer.json" ] then - ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev --prefer-dist\" + #ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev --prefer-dist\" + ynh_exec_warn_less ynh_composer_exec --commands="update" else # Install composer.json cp "$final_path/composer.json-dist" "$final_path/composer.json" @@ -166,6 +167,9 @@ then # Create logs and temp directories mkdir -p "$final_path/"{logs,temp} + # Install Installer Update for Composer 2.0 + ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0" + # Install net_LDAP ynh_composer_exec --commands="require kolab/net_ldap3" From ecd3d3c8d27a6d7b4406d56340b18d739a88956b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Oct 2021 11:48:30 +0200 Subject: [PATCH 76/78] Update upgrade --- scripts/upgrade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7c0e305..19a2299 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,7 +152,6 @@ then # Check if dependencies need to be updated with Composer if [ -f "$final_path/composer.json" ] then - #ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev --prefer-dist\" ynh_exec_warn_less ynh_composer_exec --commands="update" else # Install composer.json @@ -171,7 +170,7 @@ then ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0" # Install net_LDAP - ynh_composer_exec --commands="require kolab/net_ldap3" + #ynh_composer_exec --commands="require kolab/net_ldap3" # Update or install contextmenu and automatic_addressbook plugins # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook From fb5dd045a6e87b4fbb1e3067378df32c6eee8d71 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Oct 2021 11:50:11 +0200 Subject: [PATCH 77/78] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 19a2299..702d20c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,7 +152,7 @@ then # Check if dependencies need to be updated with Composer if [ -f "$final_path/composer.json" ] then - ynh_exec_warn_less ynh_composer_exec --commands="update" + ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev --prefer-dist\" else # Install composer.json cp "$final_path/composer.json-dist" "$final_path/composer.json" @@ -170,7 +170,7 @@ then ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0" # Install net_LDAP - #ynh_composer_exec --commands="require kolab/net_ldap3" + ynh_composer_exec --commands="require kolab/net_ldap3" # Update or install contextmenu and automatic_addressbook plugins # https://plugins.roundcube.net/packages/sblaisot/automatic_addressbook From 1731f9223ba6cb1416a10e3b728657f68c0c9de3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 19 Oct 2021 12:45:44 +0200 Subject: [PATCH 78/78] Update upgrade --- scripts/upgrade | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 702d20c..b912fb3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,6 +112,10 @@ then ynh_setup_source --dest_dir="$final_path" fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:www-data "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -152,7 +156,7 @@ then # Check if dependencies need to be updated with Composer if [ -f "$final_path/composer.json" ] then - ynh_exec_warn_less ynh_composer_exec --commands=\"update --no-dev --prefer-dist\" + ynh_exec_warn_less ynh_composer_exec --commands="update" else # Install composer.json cp "$final_path/composer.json-dist" "$final_path/composer.json" @@ -166,9 +170,6 @@ then # Create logs and temp directories mkdir -p "$final_path/"{logs,temp} - # Install Installer Update for Composer 2.0 - ynh_composer_exec --commands="require roundcube/plugin-installer:>=0.2.0" - # Install net_LDAP ynh_composer_exec --commands="require kolab/net_ldap3" @@ -247,10 +248,6 @@ then ynh_exec_warn ./bin/update.sh --version=$oldversion -y) fi -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" - #================================================= # RELOAD NGINX #=================================================