Gitlab CSE Unil
Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
M. Chardon
ADIM
Commits
00bac00d
Commit
00bac00d
authored
Aug 03, 2015
by
Julien Furrer
Browse files
Corrigé apache base.conf template et staging.conf settings
parent
e865276b
Changes
2
Hide whitespace changes
Inline
Side-by-side
adim_project/adim_project/apache/staging.conf
View file @
00bac00d
...
@@ -79,17 +79,15 @@
...
@@ -79,17 +79,15 @@
RedirectMatch
^/
adim
-
dev
$ /
adim
-
dev
/
RedirectMatch
^/
adim
-
dev
$ /
adim
-
dev
/
<
Location
"/adim-dev/"
>
<
IfModule
rewrite_module
>
<
IfModule
rewrite_module
>
RewriteEngine
On
RewriteEngine
On
## Retourne une 404 pour media/protected au lien d'une 403
## Retourne une 404 pour media/protected au lien d'une 403
RewriteRule
^/
adim
-
dev
/
media
/
ao_images
/.*$ - [
R
=
404
,
L
,
NS
]
RewriteRule
^/
adim
-
dev
/
media
/
ao_images
/.*$ - [
R
=
404
,
L
,
NS
]
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
#RewriteRule ^.*$ /maintenance.html
</
IfModule
>
</
IfModule
>
</
Location
>
<
Location
"/adim-dev/admin/"
>
<
Location
"/adim-dev/admin/"
>
<
IfModule
rewrite_module
>
<
IfModule
rewrite_module
>
...
...
adim_project/templates/apache_config/base.conf
View file @
00bac00d
...
@@ -98,17 +98,15 @@
...
@@ -98,17 +98,15 @@
{%
endblock
wsgi
%}
{%
endblock
wsgi
%}
{%
block
rewrite_protected
%}
{%
block
rewrite_protected
%}
<
Location
"{{ settings.BASE_URL|default:"
/
" }}"
>
<
IfModule
rewrite_module
>
<
IfModule
rewrite_module
>
RewriteEngine
On
RewriteEngine
On
## Retourne une 404 pour media/protected au lien d'une 403
## Retourne une 404 pour media/protected au lien d'une 403
RewriteRule
^{{
settings
.
MEDIA_URL
}}
ao_images
/.*$ - [
R
=
404
,
L
,
NS
]
RewriteRule
^{{
settings
.
MEDIA_URL
}}
ao_images
/.*$ - [
R
=
404
,
L
,
NS
]
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REMOTE_ADDR} !^130.223.3.229$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteCond %{REQUEST_URI} !^/static/.*$
#RewriteRule ^.*$ /maintenance.html
#RewriteRule ^.*$ /maintenance.html
</
IfModule
>
</
IfModule
>
</
Location
>
{%
endblock
rewrite_protected
%}
{%
endblock
rewrite_protected
%}
{%
block
rewrite_admin_protected
%}
{%
block
rewrite_admin_protected
%}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment