[SCM] ciderwebmail Debian packaging branch, master, updated. debian/1.04_20120610-2-10-g8f10aa1

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 2d443f3b3de824851df13156f899b0ed488077bb
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jun 11 21:27:59 2012 +0200

    Set default config dir in PSGI file.

diff --git a/debian/README.Debian b/debian/README.Debian
index 9a36d70..a8e083d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -14,7 +14,7 @@ CiderWebmail uses PSGI, but Debian packaging currently does not
 integrate with any specific PSGI implementation.  The most minimal PSGI
 setup is to invoke the following, as the user given write access above:
 
-    CATALYST_CONFIG=/etc/ciderwebmail plackup /etc/ciderwebmail/ciderwebmail.psgi
+    plackup /etc/ciderwebmail/ciderwebmail.psgi
 
 For production use there are many options either with a dedicated PSGI
 server like twiggy or starman, or using bindings to CGI, FCGI or uWSGI.
diff --git a/debian/etc/ciderwebmail.psgi b/debian/etc/ciderwebmail.psgi
index 8095a94..e151914 100644
--- a/debian/etc/ciderwebmail.psgi
+++ b/debian/etc/ciderwebmail.psgi
@@ -1,6 +1,10 @@
 use strict;
 use warnings;
 
+BEGIN {
+	$ENV{CATALYST_CONFIG} |= '/etc/ciderwebmai';
+}
+
 use CiderWebmail;
 
 my $app = CiderWebmail->apply_default_middlewares(CiderWebmail->psgi_app);

-- 
ciderwebmail Debian packaging