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
34d4c864
Commit
34d4c864
authored
Nov 03, 2015
by
Julien Furrer
Browse files
màj config apache pour compat avec 24, màj settings ttp pour moodle
parent
c4b33514
Changes
3
Show whitespace changes
Inline
Side-by-side
adim_project/adim_project/apache/production.conf
View file @
34d4c864
adim_project/adim_project/apache/staging.conf
View file @
34d4c864
...
...
@@ -7,8 +7,13 @@
<
Directory
"/var/django/projects/adim-dev.django/adim_project/static"
>
Options
+
FollowSymLinks
-
Indexes
<
IfVersion
>=
2
.
4
>
Require
all
granted
</
IfVersion
>
<
IfVersion
<
2
.
4
>
Order
deny
,
allow
Allow
from
all
</
IfVersion
>
<
IfModule
expires_module
>
ExpiresActive
On
ExpiresDefault
"access plus 10 minutes"
...
...
@@ -23,17 +28,27 @@
# ----------
Alias
/
adim
-
dev
/
media
/
"/var/django/projects/adim-dev.django/adim_project/media/"
<
Directory
"/var/django/projects/adim-dev.django/adim_project/media"
>
Options
+
FollowSymLinks
-
Indexes
<
IfVersion
>=
2
.
4
>
Require
all
granted
</
IfVersion
>
<
IfVersion
<
2
.
4
>
Order
deny
,
allow
Allow
from
all
</
IfVersion
>
Options
+
FollowSymLinks
+
Indexes
</
Directory
>
# ---------------
# Protected Media
# ---------------
<
Directory
"/var/django/projects/adim-dev.django/adim_project/media/ao_images/"
>
<
IfVersion
>=
2
.
4
>
Require
all
denied
</
IfVersion
>
<
IfVersion
<
2
.
4
>
Order
allow
,
deny
Deny
from
all
</
IfVersion
>
# --------------
# XsendFile Conf
...
...
@@ -50,14 +65,10 @@
# ---------------
<
IfModule
mod_shib
>
<
Location
/
adim
-
dev
/
shibauth
/>
#Order allow,deny
#Allow from all
AuthType
shibboleth
ShibRequireSession
On
ShibRedirectToSSL
443
require
uniqueID
impossiblevaluehere
@
nowhere
.
org
require
valid
-
user
ShibCompatWith24
On
ShibRequestSetting
requireSession
true
Require
shibboleth
</
Location
>
</
IfModule
>
...
...
@@ -72,8 +83,13 @@
WSGIProcessGroup
adim
-
dev
.
django
WSGIPassAuthorization
On
<
Files
wsgi
.
py
>
<
IfVersion
>=
2
.
4
>
Require
all
granted
</
IfVersion
>
<
IfVersion
<
2
.
4
>
Order
deny
,
allow
Allow
from
all
</
IfVersion
>
</
Files
>
</
Directory
>
...
...
@@ -83,10 +99,6 @@
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/s-412-5/admin/"
>
...
...
@@ -97,8 +109,13 @@
RewriteRule
^.*$ - [
R
=
404
,
L
,
NS
]
</
IfModule
>
<
IfModule
!
rewrite_module
>
<
IfVersion
>=
2
.
4
>
Require
all
denied
</
IfVersion
>
<
IfVersion
<
2
.
4
>
Order
allow
,
deny
Deny
from
all
</
IfVersion
>
</
IfModule
>
</
Location
>
...
...
adim_project/adim_project/settings/base.py
View file @
34d4c864
...
...
@@ -271,7 +271,7 @@ ATTP = {
'CACHE_TIMEOUT'
:
20
,
# 30,
},
'moodle'
:
{
'CHECK_URL'
:
"http://
tst
moodle.unil.ch/
29/
mod/adim/checkAccess.php?uuid={uuid}"
,
'CHECK_URL'
:
"http://moodle
2
.unil.ch/mod/adim/checkAccess.php?uuid={uuid}"
,
'MODE_ID'
:
16
},
'toto'
:
{
...
...
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