[Debian-l10n-commits] r2768 - in /pootle/trunk/debian: pootle.conf pootle.install rules

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

Author: themill-guest
Date: Wed Nov 16 16:08:10 2011
New Revision: 2768

URL: http://svn.debian.org/wsvn/?sc=1&rev=2768
Log:
Add WSGI snippets to appropriate places

Modified:
    pootle/trunk/debian/pootle.conf
    pootle/trunk/debian/pootle.install
    pootle/trunk/debian/rules

Modified: pootle/trunk/debian/pootle.conf
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.conf?rev=2768&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.conf (original)
+++ pootle/trunk/debian/pootle.conf Wed Nov 16 16:08:10 2011
@@ -1,32 +1,30 @@
-# This is an Apache 1.3 configuration file to proxy the requests from a
-# pootle.<...>/ host to the Pootle server
+# Default Apache 2.x WSGI configuration file for pootle
+# Change all occurrences of /pootle to something else if desired.
 
-# It requires the Rewrite module
-RewriteEngine on
-# The Proxy module must also be loaded (usually in modules.conf):
-# LoadModule proxy_module /usr/lib/apache/1.3/libproxy.so
-
-# Do not proxy static content.
-RewriteCond   %{HTTP_HOST}  ^pootle.
-RewriteRule   ^/pootle.css$ /pootle/pootle.css [PT,L]
-RewriteCond   %{HTTP_HOST}  ^pootle.
-RewriteRule   ^/favicon.ico$ /pootle/favicon.ico [PT,L]
-RewriteCond   %{HTTP_HOST}  ^pootle.
-RewriteRule   ^/js(.*)$ /pootle/js$1 [PT,L]
-RewriteCond   %{HTTP_HOST}  ^pootle.
-RewriteRule   ^/images(.*)$ /pootle/images$1 [PT,L]
-RewriteCond   %{HTTP_HOST}  ^pootle.
-RewriteRule   ^/doc(.*)$ /pootle/doc$1 [PT,L]
-
-# Proxy the dynamic content
-RewriteCond   %{HTTP_HOST}  ^pootle.
-RewriteRule   ^(.*)$ http://localhost:8080$1 [P]
-
-
-# This contains the static content
-Alias /pootle /usr/share/pootle/html
-<Directory /usr/share/pootle/html>
-  Order allow,deny
-  Allow from all
+WSGIScriptAlias /pootle /usr/share/pootle/wsgi.py
+<Directory /usr/share/pootle>
+    Order deny,allow
+    Allow from all
 </Directory>
 
+Alias /pootle/html /usr/share/pootle/html
+<Directory /usr/share/pootle/html>
+    Order deny,allow
+    Allow from all
+</Directory>
+
+Alias /pootle/export /var/lib/pootle/po
+<Directory "/var/lib/pootle/po">
+    Order deny,allow
+    Allow from all
+</Directory>
+
+<IfModule mod_deflate.c>
+    <location /pootle/html>
+        SetOutputFilter DEFLATE
+    </location>
+    <location /pootle/export>
+        SetOutputFilter DEFLATE
+    </location>
+</IfModule>
+

Modified: pootle/trunk/debian/pootle.install
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.install?rev=2768&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.install (original)
+++ pootle/trunk/debian/pootle.install Wed Nov 16 16:08:10 2011
@@ -1,2 +1,3 @@
 debian/dbconfig.template /usr/share/doc/pootle/
+debian/pootle.conf /etc/apache2/conf.d
 

Modified: pootle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/rules?rev=2768&op=diff
==============================================================================
--- pootle/trunk/debian/rules (original)
+++ pootle/trunk/debian/rules Wed Nov 16 16:08:10 2011
@@ -15,4 +15,5 @@
 	rm $(d)/usr/share/doc/pootle/ChangeLog
 	# Pootle includes a copy of some javascript libraries
 	rm $(d)/usr/share/pootle/html/js/jquery/jquery.min.js $(d)/usr/share/pootle/html/js/jquery/jquery.cookie.js #$(d)/usr/share/pootle/html/js/json2.min.js
+	mv $(d)/usr/share/doc/pootle/wsgi.py $(d)/usr/share/pootle/wsgi.py