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

version 16 (#146)

Browse source 
* Fix

* Auto-update README

* Update config.inc.php

* Update config.inc.php

* Update install

* Update install

* Update install

* Update install

* Update upgrade

* PHP8.0

* Update app.src

* Update restore

Co-authored-by: Yunohost-Bot <>
This commit is contained in:
Éric Gaspar 2022-08-05 17:15:52 +02:00 committed by GitHub
parent 97b9dd909d
commit 35f397168d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -27,7 +27,7 @@ In addition to Roundcube core features, the following are made available with th
* Support for PGP encryption with Enigma plugin by default. * 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/

2
README_fr.md
View file

@ -28,7 +28,7 @@ En plus des fonctionnalités principales de Roundcube, les éléments suivants s
* Prise en charge du chiffrement PGP avec le plugin Enigma installé par default. * 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-complete.tar.gz
SOURCE_SUM=22fdfa0f868fc478dfbb1dfa9bcd5fc91be981182334ca6079ad1ae03ac4c96e SOURCE_SUM=2409ccdfe2e465f086cb9fc18c88dfe0aaf6ccc23924564975061209921694ba
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',

4
manifest.json
View file

@ -6,7 +6,7 @@
"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",
@ -26,7 +26,7 @@
"multi_instance": true, "multi_instance": true,
"services": [ "services": [
"nginx", "nginx",
"php7.3-fpm", "php8.0-fpm",
"mysql" "mysql"
], ],
"arguments": { "arguments": {

2
scripts/_common.sh
View file

@ -4,7 +4,7 @@
# COMMON VARIABLES # COMMON VARIABLES
#================================================= #=================================================
YNH_PHP_VERSION="7.3" YNH_PHP_VERSION="8.0"
# 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}-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"

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

2
scripts/upgrade
View file

@ -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"