diff --git a/README.md b/README.md index f65cb5f..d737067 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # Roundcube for YunoHost -[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) +[![Integration level](https://dash.yunohost.org/integration/roundcube.svg)](https://dash.yunohost.org/appci/app/roundcube) [![Install Roundcube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=roundcube) -> *This package allow you to install Roundcube quickly and simply on a YunoHost server. +> *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.* ## Overview [Roundcube](https://roundcube.net/) is a browser-based multilingual IMAP client with an application-like user interface. -**Shipped version:** 1.3.9 +**Shipped version:** 1.4.1 ## Screenshots diff --git a/conf/app.src b/conf/app.src index a5f0116..19f7188 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.3.9/roundcubemail-1.3.9.tar.gz -SOURCE_SUM=7775176dfcb1e4ed39586d95a4fad0ee7b4a582e071233b4e3bf7d59040c1b5a +SOURCE_URL=https://github.com/roundcube/roundcubemail/releases/download/1.4.1/roundcubemail-1.4.1.tar.gz +SOURCE_SUM=33100013a8eacbc23082c8601cf370ac7701ae0e0778c4a960a23d0edfa0a7bc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/enigma.config.inc.php b/conf/enigma.config.inc.php new file mode 100644 index 0000000..4804bfb --- /dev/null +++ b/conf/enigma.config.inc.php @@ -0,0 +1,77 @@ += 2.1. +$config['enigma_pgp_gpgconf'] = ''; + +// Name of the PGP symmetric cipher algorithm. +// Run gpg --version to see the list of supported algorithms +$config['enigma_pgp_cipher_algo'] = null; + +// Name of the PGP digest (hash) algorithm. +// Run gpg --version to see the list of supported algorithms +$config['enigma_pgp_digest_algo'] = null; + +// Enables multi-host environments support. +// Enable it if you have more than one HTTP server. +// Make sure all servers run the same GnuPG version and have time in sync. +// Keys will be stored in SQL database (make sure max_allowed_packet +// is big enough). +$config['enigma_multihost'] = false; + +// Enables signatures verification feature. +$config['enigma_signatures'] = true; + +// Enables messages decryption feature. +$config['enigma_decryption'] = true; + +// Enables messages encryption and signing feature. +$config['enigma_encryption'] = true; + +// Enable signing all messages by default +$config['enigma_sign_all'] = false; + +// Enable encrypting all messages by default +$config['enigma_encrypt_all'] = false; + +// Enable attaching a public key to all messages by default +$config['enigma_attach_pubkey'] = false; + +// Default for how long to store private key passwords (in minutes). +// When set to 0 passwords will be stored for the whole session. +$config['enigma_password_time'] = 5; + +// With this option you can lock composing options +// of the plugin forcing the user to use configured settings. +// The array accepts: 'sign', 'encrypt', 'pubkey'. +// +// For example, to force your users to sign every email, +// you should set: +// - enigma_sign_all = true +// - enigma_options_lock = array('sign') +// - dont_override = array('enigma_sign_all') +$config['enigma_options_lock'] = array(); diff --git a/manifest.json b/manifest.json index 067dd99..6b47c9d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open Source Webmail software", "fr": "Webmail Open Source" }, - "version": "1.3.9~ynh1", + "version": "1.4.1~ynh1", "url": "https://roundcube.net/", "license": "GPL-3.0-only", "maintainer": { diff --git a/scripts/install b/scripts/install index df8a260..77bf567 100644 --- a/scripts/install +++ b/scripts/install @@ -184,7 +184,11 @@ fi # Install Enigma plugin if [ $with_enigma -eq 1 ] then - cp -a "$final_path/plugins/enigma/config.inc.php.dist" "$final_path/plugins/enigma/config.inc.php" \ + 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 @@ -211,6 +215,7 @@ ynh_store_file_checksum --file="$rc_conf" # 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} #================================================= diff --git a/scripts/restore b/scripts/restore index ac1d5e3..7fa57b8 100644 --- a/scripts/restore +++ b/scripts/restore @@ -67,6 +67,7 @@ ynh_system_user_create --username=$app # 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} #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index b993aed..da248f8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -226,7 +226,11 @@ then # Install Enigma plugin if [ $with_enigma -eq 1 ] then - cp -a "$final_path/plugins/enigma/config.inc.php.dist" "$final_path/plugins/enigma/config.inc.php" \ + 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 @@ -262,6 +266,7 @@ fi # 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} #=================================================