This is an automated email from the git hooks/post-receive script. js pushed a commit to branch master in repository ciderwebmail.
commit b7473ace1621fd43965414b48306db18faa14276 Author: Jonas Smedegaard <[email protected]> Date: Sat Mar 16 21:28:41 2013 +0100 Improve uWSGI config to set HOME and CONFIG paths in PSGI script (not configfile), and list only commented out in uWSGI ini-file. --- debian/etc/ciderwebmail/ciderwebmail.conf | 3 --- debian/etc/ciderwebmail/ciderwebmail.psgi | 3 ++- debian/etc/uwsgi/apps-available/ciderwebmail.ini | 5 +++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/etc/ciderwebmail/ciderwebmail.conf b/debian/etc/ciderwebmail/ciderwebmail.conf index 8d5fb7f..9ed058d 100644 --- a/debian/etc/ciderwebmail/ciderwebmail.conf +++ b/debian/etc/ciderwebmail/ciderwebmail.conf @@ -26,6 +26,3 @@ username_default_address 0 <Model::DB> connect_info dbi:SQLite:/var/lib/ciderwebmail/user_settings.sql </Model::DB> - -root /usr/share/ciderwebmail/root -home /usr/share/ciderwebmail diff --git a/debian/etc/ciderwebmail/ciderwebmail.psgi b/debian/etc/ciderwebmail/ciderwebmail.psgi index 2828415..dae69ec 100644 --- a/debian/etc/ciderwebmail/ciderwebmail.psgi +++ b/debian/etc/ciderwebmail/ciderwebmail.psgi @@ -2,7 +2,8 @@ use strict; use warnings; BEGIN { - $ENV{CATALYST_CONFIG} |= '/etc/ciderwebmail'; + $ENV{CIDERWEBMAIL_HOME} |= '/usr/share/ciderwebmail'; + $ENV{CIDERWEBMAIL_CONFIG} |= '/etc/ciderwebmail'; } use CiderWebmail; diff --git a/debian/etc/uwsgi/apps-available/ciderwebmail.ini b/debian/etc/uwsgi/apps-available/ciderwebmail.ini index 4e9aa5d..6ef6c74 100644 --- a/debian/etc/uwsgi/apps-available/ciderwebmail.ini +++ b/debian/etc/uwsgi/apps-available/ciderwebmail.ini @@ -11,8 +11,9 @@ chmod-socket = 600 check-static = /usr/share/ciderwebmail/root/static psgi = /etc/ciderwebmail/ciderwebmail.psgi -# FIXME: also set ROOT -env = CATALYST_CONFIG=/etc/ciderwebmail +# overrride e.g. when serving multiple custom-configured instances +#env = CIDERWEBMAIL_HOME=/usr/share/ciderwebmail +#env = CIDERWEBMAIL_CONFIG=/etc/ciderwebmail # save memory - more info at <http://projects.unbit.it/uwsgi/wiki/KSM> ksm = 1 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
