YunoHost-Apps/roundcube_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/roundcube_ynh.git synced 2024-09-03 20:16:28 +02:00
Code Issues Activity Actions

testing (#148)

Browse source 
* Upgrade to 1.6.0
* Upgrade requirements to Bullseye
This commit is contained in:
Éric Gaspar 2022-08-17 11:13:14 +02:00 committed by GitHub
parent 12815c058c
commit 52a89f031e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -27,7 +27,8 @@ In addition to Roundcube core features, the following are made available with th
* Support for PGP encryption with Enigma plugin by default. * Support for PGP encryption with Enigma plugin by default.
**Shipped version:** 1.5.3~ynh1 **Shipped version:** 1.6.0~ynh1
**Demo:** https://demo.yunohost.org/webmail/ **Demo:** https://demo.yunohost.org/webmail/

3
README_fr.md
View file

@ -28,7 +28,8 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
* Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. * Prise en charge du chiffrement PGP avec le plugin Enigma installé par default.
**Version incluse :** 1.5.3~ynh1 **Version incluse :** 1.6.0~ynh1
**Démo :** https://demo.yunohost.org/webmail/ **Démo :** https://demo.yunohost.org/webmail/

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.5.3/roundcubemail-1.5.3.tar.gz SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0.tar.gz
SOURCE_SUM=22fdfa0f868fc478dfbb1dfa9bcd5fc91be981182334ca6079ad1ae03ac4c96e SOURCE_SUM=1224eaf628888e503c49d0e8a69aa4997e566c3605738d0303d9c7a09722f363
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

10
conf/config.inc.php
View file

@ -41,7 +41,7 @@ $config['db_dsnw'] = 'mysql://__DB_NAME__:__DB_PWD__@localhost/__DB_NAME__';
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
// %s - domain name after the '@' from e-mail address provided at login screen // %s - domain name after the '@' from e-mail address provided at login screen
// For example %n = mail.domain.tld, %t = domain.tld // For example %n = mail.domain.tld, %t = domain.tld
$config['default_host'] = 'localhost'; $config['imap_host'] = 'localhost:143';
// SMTP server host (for sending mails). // SMTP server host (for sending mails).
// Enter hostname with prefix ssl:// to use Implicit TLS, or use // Enter hostname with prefix ssl:// to use Implicit TLS, or use
@ -55,10 +55,7 @@ $config['default_host'] = 'localhost';
// For example %n = mail.domain.tld, %t = domain.tld // For example %n = mail.domain.tld, %t = domain.tld
// To specify different 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'] // of IMAP host (no prefix or port) and SMTP server e.g. ['imap.example.com' => 'smtp.example.net']
$config['smtp_server'] = 'tls://' . $main_domain; $config['smtp_host'] = 'tls://' . $main_domain;
// 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 // SMTP username (if required) if you use %u as the username Roundcube
// will use the current username for login // will use the current username for login
@ -113,8 +110,7 @@ $config['enable_spellcheck'] = false;
// Enable YunoHost users search in the address book. // Enable YunoHost users search in the address book.
$config['ldap_public']['yunohost'] = array( $config['ldap_public']['yunohost'] = array(
'name' => 'YunoHost Users', 'name' => 'YunoHost Users',
'hosts' => array('localhost'), 'hosts' => array('localhost:389'),
'port' => 389,
'user_specific' => false, 'user_specific' => false,
'base_dn' => 'ou=users,dc=yunohost,dc=org', 'base_dn' => 'ou=users,dc=yunohost,dc=org',
'scope' => 'list', 'scope' => 'list',

2
conf/nginx.conf
View file

@ -5,7 +5,7 @@ location __PATH__/ {
alias __FINALPATH__/ ; alias __FINALPATH__/ ;
index index.php; index index.php;
client_max_body_size 10G; client_max_body_size 50M;
try_files $uri $uri/ /index.php?q=$uri&$args; try_files $uri $uri/ /index.php?q=$uri&$args;
# pass PHP scripts to FastCGI server # pass PHP scripts to FastCGI server

4
conf/php-fpm.conf
View file

@ -419,8 +419,8 @@ chdir = __FINALPATH__
;php_admin_value[memory_limit] = 32M ;php_admin_value[memory_limit] = 32M
; Common values to change to increase file upload limit ; Common values to change to increase file upload limit
; php_admin_value[upload_max_filesize] = 50M php_admin_value[upload_max_filesize] = 50M
; php_admin_value[post_max_size] = 50M php_admin_value[post_max_size] = 50M
; php_admin_flag[mail.add_x_header] = Off ; php_admin_flag[mail.add_x_header] = Off
; Other common parameters ; Other common parameters

9
manifest.json
View file

@ -6,14 +6,15 @@
"en": "Open Source Webmail software", "en": "Open Source Webmail software",
"fr": "Webmail Open Source" "fr": "Webmail Open Source"
}, },
"version": "1.5.3~ynh1", "version": "1.6.0~ynh1",
"url": "https://roundcube.net/", "url": "https://roundcube.net/",
"upstream": { "upstream": {
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"website": "https://roundcube.net/", "website": "https://roundcube.net/",
"demo": "https://demo.yunohost.org/webmail/", "demo": "https://demo.yunohost.org/webmail/",
"admindoc": "https://github.com/roundcube/roundcubemail/wiki", "admindoc": "https://github.com/roundcube/roundcubemail/wiki",
"code": "https://github.com/roundcube/roundcubemail" "code": "https://github.com/roundcube/roundcubemail",
"cpe": "cpe:2.3:a:roundcube:webmail"
}, },
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"maintainer": { "maintainer": {
@ -21,12 +22,12 @@
"email": "" "email": ""
}, },
"requirements": { "requirements": {
"yunohost": ">= 4.3.2" "yunohost": ">= 11.0.9"
}, },
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm", "php7.4-fpm",
"mysql" "mysql"
], ],
"arguments": { "arguments": {

4
scripts/_common.sh
View file

@ -4,10 +4,10 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="7.4"
# Package dependencies # Package dependencies
pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl" pkg_dependencies="php-pear php${YNH_PHP_VERSION}-ldap php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-curl"
# Composer version # Composer version
YNH_COMPOSER_VERSION=2.3.7 YNH_COMPOSER_VERSION=2.3.7

2
scripts/backup
View file

@ -26,7 +26,7 @@ app=$YNH_APP_INSTANCE_NAME
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
domain=$(ynh_app_setting_get --app=$app --key=domain) domain=$(ynh_app_setting_get --app=$app --key=domain)
db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_name=$(ynh_app_setting_get --app=$app --key=db_name)
phpversion=$YNH_PHP_VERSION phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
#================================================= #=================================================
# DECLARE DATA AND CONF FILES TO BACKUP # DECLARE DATA AND CONF FILES TO BACKUP

2
scripts/install
View file

@ -203,7 +203,7 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="&
# Update javascript dependencies # Update javascript dependencies
(cd "$final_path" (cd "$final_path"
/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) /usr/bin/php$phpversion -q ./bin/update.sh -v ?)
# Store the config file checksum into the app settings # Store the config file checksum into the app settings
ynh_store_file_checksum --file="$final_path/config/config.inc.php" ynh_store_file_checksum --file="$final_path/config/config.inc.php"

24
scripts/restore
View file

@ -38,16 +38,11 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)
#================================================= #=================================================
ynh_script_progression --message="Validating restoration parameters..." --weight=3 ynh_script_progression --message="Validating restoration parameters..." --weight=3
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path " test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path "
#================================================= #=================================================
# STANDARD RESTORATION STEPS # STANDARD RESTORATION STEPS
#=================================================
# RESTORE THE NGINX CONFIGURATION
#=================================================
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
#================================================= #=================================================
# RECREATE THE DEDICATED USER # RECREATE THE DEDICATED USER
#================================================= #=================================================
@ -67,6 +62,14 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# REINSTALL DEPENDENCIES
#=================================================
ynh_script_progression --message="Reinstalling dependencies..." --weight=1
# Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# RESTORE THE PHP-FPM CONFIGURATION # RESTORE THE PHP-FPM CONFIGURATION
#================================================= #=================================================
@ -78,12 +81,11 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint --phpversion=$phpversion
#================================================= #=================================================
# REINSTALL DEPENDENCIES # RESTORE THE NGINX CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Reinstalling dependencies..." --weight=1 ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1
# Define and install dependencies ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# SPECIFIC RESTORATION # SPECIFIC RESTORATION

18
scripts/upgrade
View file

@ -131,14 +131,6 @@ chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:www-data "$final_path" chown -R $app:www-data "$final_path"
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# UPGRADE DEPENDENCIES # UPGRADE DEPENDENCIES
#================================================= #=================================================
@ -154,6 +146,14 @@ ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=5
# Create a dedicated PHP-FPM config # Create a dedicated PHP-FPM config
ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
#=================================================
# NGINX CONFIGURATION
#=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
# Create a dedicated NGINX config
ynh_add_nginx_config
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE
#================================================= #=================================================
@ -255,7 +255,7 @@ then
# Update JavaScript dependencies # Update JavaScript dependencies
(cd "$final_path" (cd "$final_path"
/usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) /usr/bin/php$phpversion -q ./bin/update.sh -v ?)
# Store the config file checksum into the app settings # Store the config file checksum into the app settings
ynh_store_file_checksum --file="$final_path/config/config.inc.php" ynh_store_file_checksum --file="$final_path/config/config.inc.php"