Add apache directive for passing URLs to gunicorn unchanged.

Fixes #1583

diff --git a/docs/source/adminguide.rst b/docs/source/adminguide.rst
index 014267e..4151e60 100644 (file)
--- a/docs/source/adminguide.rst
+++ b/docs/source/adminguide.rst
@@ -43,11 +43,11 @@ Edit ``/etc/apache2/sites-available/pithos`` (change the ``ServerName`` directiv
     </Directory>
 
     RewriteEngine On
-    RewriteRule ^/v(.*) /api/v$1 [PT]
-    RewriteRule ^/public(.*) /api/public$1 [PT]
-    RewriteRule ^/tools(.*) /api/ui$1 [PT]
-    RewriteRule ^/im(.*) https://%{HTTP_HOST}%{REQUEST_URI}
-    RewriteRule ^/login(.*) https://%{HTTP_HOST}%{REQUEST_URI}
+    RewriteRule ^/v(.*) /api/v$1 [PT,NE]
+    RewriteRule ^/public(.*) /api/public$1 [PT,NE]
+    RewriteRule ^/tools(.*) /api/ui$1 [PT,NE]
+    RewriteRule ^/im(.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
+    RewriteRule ^/login(.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
 
     WSGIScriptAlias /api /pithos/pithos/wsgi/pithos.wsgi
     # WSGIDaemonProcess pithos
@@ -77,26 +77,16 @@ Edit ``/etc/apache2/sites-available/pithos-ssl`` (assuming files in ``/etc/ssl/p
     </Directory>
 
     RewriteEngine On
-    RewriteRule ^/v(.*) /api/v$1 [PT]
-    RewriteRule ^/public(.*) /api/public$1 [PT]
-    RewriteRule ^/tools(.*) /api/ui$1 [PT]
-    RewriteRule ^/im(.*) /api/im$1 [PT]
-    RewriteRule ^/login(.*) /api/im/login/dummy$1 [PT]
+    RewriteRule ^/v(.*) /api/v$1 [PT,NE]
+    RewriteRule ^/public(.*) /api/public$1 [PT,NE]
+    RewriteRule ^/tools(.*) /api/ui$1 [PT,NE]
+    RewriteRule ^/im(.*) /api/im$1 [PT,NE]
+    RewriteRule ^/login(.*) /api/im/login/dummy$1 [PT,NE]
 
     WSGIScriptAlias /api /pithos/pithos/wsgi/pithos.wsgi
     # WSGIDaemonProcess pithos
     # WSGIProcessGroup pithos
 
-    ShibConfig /etc/shibboleth/shibboleth2.xml
-    Alias      /shibboleth-sp /usr/share/shibboleth 
-
-    <Location /api/im/login/shibboleth>
-        AuthType shibboleth
-        ShibRequireSession On
-        ShibUseHeaders On
-        require valid-user
-    </Location>
-
     LogLevel warn
     ErrorLog ${APACHE_LOG_DIR}/pithos.error.log
     CustomLog ${APACHE_LOG_DIR}/pithos.access.log combined
@@ -190,7 +180,7 @@ Add in ``/etc/apache2/sites-available/pithos-ssl``::
   ShibConfig /etc/shibboleth/shibboleth2.xml
   Alias      /shibboleth-sp /usr/share/shibboleth 
 
-  <Location /api/login>
+  <Location /api/im/login/shibboleth>
     AuthType shibboleth
     ShibRequireSession On
     ShibUseHeaders On

diff --git a/docs/source/backends.rst b/docs/source/backends.rst
index 5542e54..50e1031 100644 (file)
--- a/docs/source/backends.rst
+++ b/docs/source/backends.rst
@@ -9,14 +9,6 @@ BaseBackend
 
 .. autoclass:: pithos.backends.base.BaseBackend
 
-SimpleBackend
--------------
-
-.. autoclass:: pithos.backends.simple.SimpleBackend
-   :show-inheritance:
-   :members:
-   :inherited-members:
-
 ModularBackend
 --------------
 
@@ -28,7 +20,7 @@ ModularBackend
 Node
 ~~~~
 
-.. automodule:: pithos.backends.lib.sqlite.node
+.. automodule:: pithos.backends.lib.sqlalchemy.node
    :show-inheritance:
    :members:
    :undoc-members:
@@ -36,7 +28,7 @@ Node
 Permissions
 ~~~~~~~~~~~
 
-.. automodule:: pithos.backends.lib.sqlite.permissions
+.. automodule:: pithos.backends.lib.sqlalchemy.permissions
    :show-inheritance:
    :members:
    :undoc-members: