Gitlab CSE Unil

Commit d6a6ac07 authored by Julien Furrer's avatar Julien Furrer
Browse files

Merge branch 'dev' of...

Merge branch 'dev' of pcpol200-3:/Users/jfurrer/JOB/___RISET/PROJECTS/Misc/AnnotationDImage/workspace/adim.django into dev
parents 64864c62 00bac00d
......@@ -79,17 +79,15 @@
RedirectMatch ^/adim-dev$ /adim-dev/
<Location "/adim-dev/">
<IfModule rewrite_module>
RewriteEngine On
## Retourne une 404 pour media/protected au lien d'une 403
RewriteRule ^/adim-dev/media/ao_images/.*$ - [R=404,L,NS]
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
</IfModule>
</Location>
<IfModule rewrite_module>
RewriteEngine On
## Retourne une 404 pour media/protected au lien d'une 403
RewriteRule ^/adim-dev/media/ao_images/.*$ - [R=404,L,NS]
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
</IfModule>
<Location "/adim-dev/admin/">
<IfModule rewrite_module>
......
......@@ -98,17 +98,15 @@
{% endblock wsgi %}
{% block rewrite_protected %}
<Location "{{ settings.BASE_URL|default:"/" }}">
<IfModule rewrite_module>
RewriteEngine On
## Retourne une 404 pour media/protected au lien d'une 403
RewriteRule ^{{ settings.MEDIA_URL }}ao_images/.*$ - [R=404,L,NS]
<IfModule rewrite_module>
RewriteEngine On
## Retourne une 404 pour media/protected au lien d'une 403
RewriteRule ^{{ settings.MEDIA_URL }}ao_images/.*$ - [R=404,L,NS]
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
</IfModule>
</Location>
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
</IfModule>
{% endblock rewrite_protected %}
{% block rewrite_admin_protected %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment