changeset 81:9ad8421dafb4 1.1

merge
author Bernhard Herzog <bh@intevation.de>
date Mon, 09 Mar 2015 17:07:48 +0100
parents ae2f4e1c4ab0 (diff) 3928af61b4ce (current diff)
children c9e424850b3c
files
diffstat 4 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /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
--- /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>
--- /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
--- 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
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)