From a0d08f6587f09706a221dcf327ab96b84164c2e7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 May 2017 11:42:03 +0200 Subject: rename README.rpm -> README-rpm.txt, fix #1449517 --- roundcubemail-README-rpm.txt | 53 ++++++++++++++++++++++++++++++++++++++++++++ roundcubemail-README.rpm | 53 -------------------------------------------- roundcubemail.spec | 11 +++++---- 3 files changed, 60 insertions(+), 57 deletions(-) create mode 100644 roundcubemail-README-rpm.txt delete mode 100644 roundcubemail-README.rpm diff --git a/roundcubemail-README-rpm.txt b/roundcubemail-README-rpm.txt new file mode 100644 index 0000000..5e558c5 --- /dev/null +++ b/roundcubemail-README-rpm.txt @@ -0,0 +1,53 @@ +Additional installation and update information: + +Upstream documentation: http://trac.roundcube.net/wiki + +Notice +- temporary files are stored in /var/lib/roundcubemail/temp +- logs files are stored in /var/log/roundcubemail +- configuration files are stored in /etc/roundcubemail +- PGP keys used by enigma plugin are stored in /var/lib/roundcubemail/enigma + +As those directories are not served by the web server, +there is no need to protect them. + +Databases + +Roundcube supports various database providers, including SQLite, MySQL and +PostgreSQL. The package depends only on php-pdo, which provides SQLite +support. However, the default configuration is for a MySQL database, for +performance reasons. To use the MySQL database, ensure php-mysql is +installed. If you want to use another database, adjust the configuration +file, and ensure the appropriate PDO plugin is installed. If necessary. + + +The installer is available at http://localhost/roundcubemail/installer +The webmail is available at http://localhost/roundcubemail + +By default, access to Roundcube and the installer is only allowed from the +server, locally, in /etc/httpd/conf.d/roundcubemail.conf . Best practice is +to create a new file - e.g. /etc/httpd/conf.d/z-roundcubemail-allow.conf - +to adjust the access permissions. You can also edit roundcubemail.conf directly, +but then any changes to it in future package updates will cause the creation +of a .rpmnew file, and you will have to merge the changes manually: creating +a new config file to configure access permissions avoids that. + +First use the installer to configure Roundcube, ideally from the server so you +do not need to allow any wider access to the installer, but you can use a new +config file to grant wider access to /usr/share/roundcubemail and +/usr/share/roundcubemail/installer if necessary. Once you have completed +deployment, you should restrict access to the /installer subdirectory again, as +an attacker could use it to do anything they liked to your Roundcube +installation. + +UPGRADING: when upgrading from < 1.0 the old configuration files named +main.inc.php and db.inc.php are now deprecated and should be replaced with one +single config.inc.php file. Run the /usr/share/roundcube/bin/update.sh script +as root to get this conversion done or manually merge the files. The update +script will also update the database configuration. Check the permissions of +the config.inc.php file and all backups the script creates! Make sure they +are not world-readable, as they may contain sensitive information (e.g. +database passwords). + +NOTE: the new config.inc.php should only contain options that differ from the +ones listed in defaults.inc.php. diff --git a/roundcubemail-README.rpm b/roundcubemail-README.rpm deleted file mode 100644 index 5e558c5..0000000 --- a/roundcubemail-README.rpm +++ /dev/null @@ -1,53 +0,0 @@ -Additional installation and update information: - -Upstream documentation: http://trac.roundcube.net/wiki - -Notice -- temporary files are stored in /var/lib/roundcubemail/temp -- logs files are stored in /var/log/roundcubemail -- configuration files are stored in /etc/roundcubemail -- PGP keys used by enigma plugin are stored in /var/lib/roundcubemail/enigma - -As those directories are not served by the web server, -there is no need to protect them. - -Databases - -Roundcube supports various database providers, including SQLite, MySQL and -PostgreSQL. The package depends only on php-pdo, which provides SQLite -support. However, the default configuration is for a MySQL database, for -performance reasons. To use the MySQL database, ensure php-mysql is -installed. If you want to use another database, adjust the configuration -file, and ensure the appropriate PDO plugin is installed. If necessary. - - -The installer is available at http://localhost/roundcubemail/installer -The webmail is available at http://localhost/roundcubemail - -By default, access to Roundcube and the installer is only allowed from the -server, locally, in /etc/httpd/conf.d/roundcubemail.conf . Best practice is -to create a new file - e.g. /etc/httpd/conf.d/z-roundcubemail-allow.conf - -to adjust the access permissions. You can also edit roundcubemail.conf directly, -but then any changes to it in future package updates will cause the creation -of a .rpmnew file, and you will have to merge the changes manually: creating -a new config file to configure access permissions avoids that. - -First use the installer to configure Roundcube, ideally from the server so you -do not need to allow any wider access to the installer, but you can use a new -config file to grant wider access to /usr/share/roundcubemail and -/usr/share/roundcubemail/installer if necessary. Once you have completed -deployment, you should restrict access to the /installer subdirectory again, as -an attacker could use it to do anything they liked to your Roundcube -installation. - -UPGRADING: when upgrading from < 1.0 the old configuration files named -main.inc.php and db.inc.php are now deprecated and should be replaced with one -single config.inc.php file. Run the /usr/share/roundcube/bin/update.sh script -as root to get this conversion done or manually merge the files. The update -script will also update the database configuration. Check the permissions of -the config.inc.php file and all backups the script creates! Make sure they -are not world-readable, as they may contain sensitive information (e.g. -database passwords). - -NOTE: the new config.inc.php should only contain options that differ from the -ones listed in defaults.inc.php. diff --git a/roundcubemail.spec b/roundcubemail.spec index 8a7c6f5..d0d3e56 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -20,7 +20,7 @@ %global _logdir /var/log Name: roundcubemail Version: 1.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client Group: Applications/System @@ -42,7 +42,7 @@ Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version} Source1: roundcubemail.httpd Source3: roundcubemail.nginx Source2: roundcubemail.logrotate -Source4: roundcubemail-README.rpm +Source4: roundcubemail-README-rpm.txt # Elegantly handle removal of moxieplayer Flash binary in tinymce # media plugin (see "Drop precompiled flash" in %%prep) Patch0: roundcubemail-1.2.1-no_swf.patch @@ -223,7 +223,7 @@ mkdir -p %{buildroot}/var/lib/roundcubemail/temp # GPG keys mkdir -p %{buildroot}/var/lib/roundcubemail/enigma -cp -pr %SOURCE4 README.rpm +cp -pr %SOURCE4 README-rpm.txt # create empty files for ghost to not remove OLD config (0.9.x) touch %{buildroot}%{_sysconfdir}/roundcubemail/db.inc.php @@ -270,7 +270,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE -%doc CHANGELOG INSTALL README.md UPGRADING README.rpm +%doc CHANGELOG INSTALL README.md UPGRADING README-rpm.txt %doc composer.json-dist %{roundcubedir} %dir %{_sysconfdir}/%{name} @@ -296,6 +296,9 @@ rm -rf %{buildroot} %changelog +* Wed May 10 2017 Remi Collet - 1.2.5-2 +- rename README.rpm -> README-rpm.txt, fix #1449517 + * Fri Apr 28 2017 Remi Collet - 1.2.5-1 - update to 1.2.5 -- cgit