roundcubemail 1.0.2

2 files changed, 37 insertions, 19 deletions

diff --git a/roundcubemail-README.rpm b/roundcubemail-README.rpm
index a894cb7..945c3e3 100644
--- a/roundcubemail-README.rpm
+++ b/roundcubemail-README.rpm
@@ -13,20 +13,29 @@ there is no need to protect them.
 
 
 The installer is available at http://localhost/roundcubemail/installer
-
-Access is only authorized from the server, locally.
-You can allow access for installation, but remember to secure it
-again once configured (upstream recommend to drop the directory).
-
-The Webmail is available at http://localhost/roundcubemail
-
-You can grant permission once configured.
-
-Set /etc/httpd/conf.d/roundcubemail.conf
-
-
-WARNING: 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 ./bin/update.sh script to get this conversion done or manually merge the files.
-
-NOTE: the new config.inc.php should only contain options that differ from the ones listed in defaults.inc.php.
+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.
+
+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 6bc0d58..ba338e4 100644
--- a/roundcubemail.spec
+++ b/roundcubemail.spec
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 %global _logdir /var/log  
 Name: roundcubemail
-Version:  1.0.1
+Version:  1.0.2
 Release:  1%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -155,7 +155,9 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG INSTALL LICENSE README.md UPGRADING README.rpm
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc CHANGELOG INSTALL README.md UPGRADING README.rpm
 %{roundcubedir}
 %dir %{_sysconfdir}/%{name}
 # OLD config files from previous version
@@ -174,6 +176,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 22 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-1
+- Update to 1.0.2 (service release)
+- pull README change from rawhide
+
+* Mon Jul 21 2014 Adam Williamson <awilliam@redhat.com> - 1.0.2-1
+- Update to 1.0.2
+
 * Mon May 12 2014 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
 - Update to 1.0.1 (service release)