Merge branch 'master' of https://code.grnet.gr/git/pithos into id

[pithos] / docs / source / adminguide.rst

diff --git a/docs/source/adminguide.rst b/docs/source/adminguide.rst
index aa3facd..a2f96d8 100644 (file)
--- a/docs/source/adminguide.rst
+++ b/docs/source/adminguide.rst
@@ -21,7 +21,7 @@ Setup the files::
 
   cd /pithos/pithos
   python manage.py syncdb
-  python manage.py schemamigration im --initial
+  python manage.py migrate im
   cd /pithos
   python setup.py build_sphinx
 
@@ -44,6 +44,9 @@ Edit ``/etc/apache2/sites-available/pithos`` (change the ``ServerName`` directiv
         Allow from all
     </Directory>
 
+    SetEnv no-gzip
+    SetEnv dont-vary
+
     RewriteEngine On
     RewriteRule ^/v(.*) /api/v$1 [PT,NE]
     RewriteRule ^/public(.*) /api/public$1 [PT,NE]
@@ -51,6 +54,8 @@ Edit ``/etc/apache2/sites-available/pithos`` (change the ``ServerName`` directiv
     RewriteRule ^/im(.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
     RewriteRule ^/login(.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
 
+    RequestHeader set X-Forwarded-Protocol "http"
+
     WSGIScriptAlias /api /pithos/pithos/wsgi/pithos.wsgi
     # WSGIDaemonProcess pithos
     # WSGIProcessGroup pithos
@@ -78,6 +83,9 @@ Edit ``/etc/apache2/sites-available/pithos-ssl`` (assuming files in ``/etc/ssl/p
         Allow from all
     </Directory>
 
+    SetEnv no-gzip
+    SetEnv dont-vary
+
     RewriteEngine On
     RewriteRule ^/v(.*) /api/v$1 [PT,NE]
     RewriteRule ^/public(.*) /api/public$1 [PT,NE]
@@ -85,6 +93,8 @@ Edit ``/etc/apache2/sites-available/pithos-ssl`` (assuming files in ``/etc/ssl/p
     RewriteRule ^/im(.*) /api/im$1 [PT,NE]
     RewriteRule ^/login(.*) /api/im/login/dummy$1 [PT,NE]
 
+    RequestHeader set X-Forwarded-Protocol "https"
+
     WSGIScriptAlias /api /pithos/pithos/wsgi/pithos.wsgi
     # WSGIDaemonProcess pithos
     # WSGIProcessGroup pithos
@@ -172,6 +182,12 @@ Configure and run::
   a2enmod proxy_http
   /etc/init.d/apache2 restart
 
+If experiencing timeout problems, try adding to ``/etc/gunicorn.d/pithos``::
+
+        ...
+        '--timeout=43200',
+        ...
+
 Shibboleth Setup
 ----------------