# HG changeset patch
# User Bernhard Herzog <bh@intevation.de>
# Date 1425917268 -3600
# Node ID 9ad8421dafb43c2df9c11472b51d575c0553aa27
# Parent  ae2f4e1c4ab0cc0bce951f1f9665c4fa6da6396f# Parent  3928af61b4cec9ab1c6171df529800ed7c656e00
merge

diff -r 3928af61b4ce -r 9ad8421dafb4 .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Mon Mar 09 17:07:48 2015 +0100
@@ -0,0 +1,1 @@
+bd3e5fdd839808907987993e960e7f68810ec951 1.0
diff -r 3928af61b4ce -r 9ad8421dafb4 apache-site.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apache-site.conf	Mon Mar 09 17:07:48 2015 +0100
@@ -0,0 +1,10 @@
+<VirtualHost localhost:5000>
+        ServerAdmin webmaster@localhost
+
+        WSGIDaemonProcess odfcast processes=2 threads=30 python-path=/home/mpuls/odfcast/releases/current:/home/mpuls/odfcast/env/lib/python2.7/site-packages
+        WSGIProcessGroup odfcast
+
+        WSGIScriptAlias / /home/mpuls/odfcast/releases/current/odfcast.wsgi
+
+        ErrorLog /var/log/apache2/odfcast-error.log
+</VirtualHost>
diff -r 3928af61b4ce -r 9ad8421dafb4 odfcast.wsgi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/odfcast.wsgi	Mon Mar 09 17:07:48 2015 +0100
@@ -0,0 +1,1 @@
+from odfcast import app as application
diff -r 3928af61b4ce -r 9ad8421dafb4 requirements.txt
--- a/requirements.txt	Fri Mar 06 15:35:40 2015 +0100
+++ b/requirements.txt	Mon Mar 09 17:07:48 2015 +0100
@@ -4,4 +4,4 @@
 py3o.renderers.pyuno>=0.3
 setuptools
 pypdf2
-wheel
+six>=1.9