[SCM] ciderwebmail Debian packaging branch, master, updated. debian/1.04_20120607-1-8-g5190c52

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 79198d5db3b8a015859ad6ca70dcf8414d960227
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Jun 10 19:33:37 2012 +0200

    Install configfiles and sample uWSGI/Apache2 integration files.

diff --git a/debian/etc/ciderwebmail.conf b/debian/etc/ciderwebmail.conf
new file mode 100644
index 0000000..ef610c6
--- /dev/null
+++ b/debian/etc/ciderwebmail.conf
@@ -0,0 +1,12 @@
+name CiderWebmail
+username_default_address 1
+language en
+root /usr/share/ciderwebmail/root
+home /usr/share/ciderwebmail
+<server>
+	port 143
+	host localhost
+</server>
+<Model::DB>
+	connect_info dbi:SQLite:/var/lib/ciderwebmail/user_settings.sql
+</Model::DB>
diff --git a/debian/etc/ciderwebmail.psgi b/debian/etc/ciderwebmail.psgi
new file mode 100644
index 0000000..5a023f6
--- /dev/null
+++ b/debian/etc/ciderwebmail.psgi
@@ -0,0 +1,7 @@
+use strict;
+use warnings;
+
+use CiderWebmail;
+
+my $app = CiderWebmail->apply_default_middlewares(CiderWebmail->psgi_app);
+$app;
diff --git a/debian/rules b/debian/rules
index 36a077b..d6c0c2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,11 +75,17 @@ CDBS_RECOMMENDS_$(pkg) = http-icons, libjs-mootools
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(root/static/(images/.*|favicon\.ico)|debian/(changelog|copyright(|_hints|_newhints)))$
 
 DEB_DH_INSTALL_ARGS_$(pkg) = root/* usr/share/$(pkg)/root/
-DEB_INSTALL_EXAMPLES_$(pkg) = ciderwebmail.yml script/update_schema.sh
+DEB_INSTALL_EXAMPLES_$(pkg) = ciderwebmail.yml script/update_schema.sh debian/uwsgi
 
 # Avoid virtually empty TODO file
 DEB_INSTALL_DOCS_ALL := $(filter-out TODO,$(DEB_INSTALL_DOCS_ALL))
 
+# Install config files
+binary-install/$(pkg)::
+	mkdir -p $(cdbs_curdestdir)etc/$(pkg)
+	touch $(cdbs_curdestdir)etc/$(pkg)/custom.css
+	cp -f -t $(cdbs_curdestdir)etc/$(pkg) debian/etc/*
+
 # Install binaries in project-specific dir and drop their manpages
 binary-post-install/$(pkg)::
 	mkdir -p $(cdbs_curdestdir)usr/share/$(pkg)/bin
@@ -93,8 +99,6 @@ binary-post-install/$(pkg)::
 	rm -rf $(cdbs_curdestdir)usr/share/$(pkg)/root/static/images/mimeicons
 	ln -sT ../../../../images/http-icons/ $(cdbs_curdestdir)usr/share/$(pkg)/root/static/images/mimeicons
 	rm -rf $(cdbs_curdestdir)usr/share/$(pkg)/root/static/css/custom.css
-	mkdir -p $(cdbs_curdestdir)etc/$(pkg)/bin
-	touch $(cdbs_curdestdir)etc/$(pkg)/custom.css
 	ln -sT /etc/ciderwebmail/custom.css $(cdbs_curdestdir)usr/share/$(pkg)/root/static/css/custom.css
 
 # Drop unneeded noise
diff --git a/debian/uwsgi/README b/debian/uwsgi/README
new file mode 100644
index 0000000..aff3778
--- /dev/null
+++ b/debian/uwsgi/README
@@ -0,0 +1,11 @@
+CiderWebmail with uWSGI and Apache2
+===================================
+
+uWSGI started as a Python WSGI but nowadays supports Perl PSGI as well.
+
+Copy the files into /etc and invoke these commands as root:
+
+    aptitude install uwsgi uwsgi-plugin-psgi libapache2-mod-uwsgi
+    service uwsgi start ciderwebmail
+
+ -- Jonas Smedegaard <dr at jones.dk>  Sun, 10 Jun 2012 19:31:13 +0200
diff --git a/debian/uwsgi/etc/apache2/conf.d/ciderwebmail b/debian/uwsgi/etc/apache2/conf.d/ciderwebmail
new file mode 100644
index 0000000..8d434bd
--- /dev/null
+++ b/debian/uwsgi/etc/apache2/conf.d/ciderwebmail
@@ -0,0 +1,4 @@
+<Location /ciderwebmail>
+	SetHandler uwsgi-handler
+	uWSGISocket /run/uwsgi/app/webmail/socket
+</Location>
diff --git a/debian/uwsgi/etc/uwsgi/apps-available/ciderwebmail.ini b/debian/uwsgi/etc/uwsgi/apps-available/ciderwebmail.ini
new file mode 100644
index 0000000..d67fecb
--- /dev/null
+++ b/debian/uwsgi/etc/uwsgi/apps-available/ciderwebmail.ini
@@ -0,0 +1,17 @@
+[uwsgi]
+plugins = 0:psgi
+
+# set when app uid is different from www-data
+#uid = ciderwebmail
+# set when web server needs write acces to files auto-created by app
+#umask = 007
+
+#chdir = /home/www-mail/public_webdata
+check-static = /usr/share/ciderwebmail/root/static
+psgi = /etc/ciderwebmail/ciderwebmail.psgi
+
+# FIXME: also set ROOT
+env = CATALYST_CONFIG=/etc/ciderwebmail
+
+# save memory - more info at <http://projects.unbit.it/uwsgi/wiki/KSM>
+ksm = 1

-- 
ciderwebmail Debian packaging