[Debian-l10n-commits] r2805 - in /pootle/trunk/debian: README.Debian TODO pootle.postinst

[themill-guest at users.alioth.debian.org]

Author: themill-guest
Date: Wed Nov 16 16:10:02 2011
New Revision: 2805

URL: http://svn.debian.org/wsvn/?sc=1&rev=2805
Log:
Only enable WSGI if it is installed

Modified:
    pootle/trunk/debian/README.Debian
    pootle/trunk/debian/TODO
    pootle/trunk/debian/pootle.postinst

Modified: pootle/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/README.Debian?rev=2805&op=diff
==============================================================================
--- pootle/trunk/debian/README.Debian (original)
+++ pootle/trunk/debian/README.Debian Wed Nov 16 16:10:02 2011
@@ -58,8 +58,8 @@
 
 
 
-Recommended and Suggested Packages
-==================================
+Optional Dependencies, Recommended and Suggested Packages
+=========================================================
 
 python-xapian
   indexing of translations to allow fast searching
@@ -76,5 +76,16 @@
 python-aeidon
   allow translations of video subtitles
 
-libapache2-mod-wsgi | httpd | cherrypy
+libapache2-mod-wsgi | httpd | python-cherrypy
   improve performance of the pootle server
+
+  * libapache2-mod-wsgi: use the Apache 2 WSGI module; the debconf prompt
+    to configure apache will install a WSGI config snippet if this module
+    is present.
+  * python-cherrpy: provides acceleration for PootleServer running in
+    "standalone" mode.
+  * httpd is included here to allow the admin to use various other ways of
+    either proxying connections to PootleServer or accelerating pootle
+    using mod_python or an alternative http server.
+
+  See http://translate.sourceforge.net/wiki/pootle/optimisation

Modified: pootle/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/TODO?rev=2805&op=diff
==============================================================================
--- pootle/trunk/debian/TODO (original)
+++ pootle/trunk/debian/TODO Wed Nov 16 16:10:02 2011
@@ -28,14 +28,6 @@
 Known problems
 ==============
 
-* if httpd is already installed, wsgi won't get dragged in leaving apache2
-  configuration broken:
-
-  Syntax error on line 4 of /etc/apache2/conf.d/pootle.conf:
-  Invalid command 'WSGIScriptAlias', perhaps misspelled or defined by a module not included in the server configuration
-
-  additionally, wsgi isn't necessarily enabled (a2enmod)
-
 lintian
 =======
 

Modified: pootle/trunk/debian/pootle.postinst
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.postinst?rev=2805&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.postinst (original)
+++ pootle/trunk/debian/pootle.postinst Wed Nov 16 16:10:02 2011
@@ -113,10 +113,17 @@
 }
 
 apache2_install() {
-    mkdir -p /etc/apache2/conf.d
-    ucf --debconf-ok /usr/share/pootle/apache2.conf /etc/apache2/conf.d/pootle.conf
-    ucfr pootle /etc/apache2/conf.d/pootle.conf
-    reload_www_server apache2
+    # only enable WSGI config if libapache2-mod-wsgi is to be installed
+    if [ -e /usr/lib/apache2/modules/mod_wsgi.so ]; then
+        mkdir -p /etc/apache2/conf.d
+        ucf --debconf-ok /usr/share/pootle/apache2.conf /etc/apache2/conf.d/pootle.conf
+        ucfr pootle /etc/apache2/conf.d/pootle.conf
+        a2enmod wsgi
+        reload_www_server apache2
+    else
+        echo "Skipping apache2 configuration as the WSGI module was not found."
+        echo "Install the libapache2-mod-wsgi package and then 'dpkg-reconfigure pootle'."
+    fi
 }
 
 lighttpd_install() {