Revision 22062611 docs/source/adminguide.rst

b/docs/source/adminguide.rst
43 43
    </Directory>
44 44

  
45 45
    RewriteEngine On
46
    RewriteRule ^/v(.*) /api/v$1 [PT]
47
    RewriteRule ^/public(.*) /api/public$1 [PT]
48
    RewriteRule ^/tools(.*) /api/ui$1 [PT]
49
    RewriteRule ^/im(.*) https://%{HTTP_HOST}%{REQUEST_URI}
50
    RewriteRule ^/login(.*) https://%{HTTP_HOST}%{REQUEST_URI}
46
    RewriteRule ^/v(.*) /api/v$1 [PT,NE]
47
    RewriteRule ^/public(.*) /api/public$1 [PT,NE]
48
    RewriteRule ^/tools(.*) /api/ui$1 [PT,NE]
49
    RewriteRule ^/im(.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
50
    RewriteRule ^/login(.*) https://%{HTTP_HOST}%{REQUEST_URI} [NE]
51 51

  
52 52
    WSGIScriptAlias /api /pithos/pithos/wsgi/pithos.wsgi
53 53
    # WSGIDaemonProcess pithos
......
77 77
    </Directory>
78 78

  
79 79
    RewriteEngine On
80
    RewriteRule ^/v(.*) /api/v$1 [PT]
81
    RewriteRule ^/public(.*) /api/public$1 [PT]
82
    RewriteRule ^/tools(.*) /api/ui$1 [PT]
83
    RewriteRule ^/im(.*) /api/im$1 [PT]
84
    RewriteRule ^/login(.*) /api/im/login/dummy$1 [PT]
80
    RewriteRule ^/v(.*) /api/v$1 [PT,NE]
81
    RewriteRule ^/public(.*) /api/public$1 [PT,NE]
82
    RewriteRule ^/tools(.*) /api/ui$1 [PT,NE]
83
    RewriteRule ^/im(.*) /api/im$1 [PT,NE]
84
    RewriteRule ^/login(.*) /api/im/login/dummy$1 [PT,NE]
85 85

  
86 86
    WSGIScriptAlias /api /pithos/pithos/wsgi/pithos.wsgi
87 87
    # WSGIDaemonProcess pithos
88 88
    # WSGIProcessGroup pithos
89 89

  
90
    ShibConfig /etc/shibboleth/shibboleth2.xml
91
    Alias      /shibboleth-sp /usr/share/shibboleth 
92

  
93
    <Location /api/im/login/shibboleth>
94
        AuthType shibboleth
95
        ShibRequireSession On
96
        ShibUseHeaders On
97
        require valid-user
98
    </Location>
99

  
100 90
    LogLevel warn
101 91
    ErrorLog ${APACHE_LOG_DIR}/pithos.error.log
102 92
    CustomLog ${APACHE_LOG_DIR}/pithos.access.log combined
......
190 180
  ShibConfig /etc/shibboleth/shibboleth2.xml
191 181
  Alias      /shibboleth-sp /usr/share/shibboleth 
192 182

  
193
  <Location /api/login>
183
  <Location /api/im/login/shibboleth>
194 184
    AuthType shibboleth
195 185
    ShibRequireSession On
196 186
    ShibUseHeaders On

Also available in: Unified diff