forked from DGNum/gestioCOF
Merge branch 'Elarnon/urls' into 'master'
Everything you know about WSGI may not hold true for ASGI See merge request !108
This commit is contained in:
commit
4eea57c899
5 changed files with 30 additions and 23 deletions
|
@ -53,6 +53,7 @@ INSTALLED_APPS = (
|
||||||
)
|
)
|
||||||
|
|
||||||
MIDDLEWARE_CLASSES = (
|
MIDDLEWARE_CLASSES = (
|
||||||
|
'debug_toolbar.middleware.DebugToolbarMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
|
@ -135,10 +136,6 @@ MEDIA_URL = '/media/'
|
||||||
# Various additional settings
|
# Various additional settings
|
||||||
SITE_ID = 1
|
SITE_ID = 1
|
||||||
|
|
||||||
# URL prefix for admin static files -- CSS, JavaScript and images.
|
|
||||||
# Make sure to use a trailing slash.
|
|
||||||
# Examples: "http://foo.com/static/admin/", "/static/admin/".
|
|
||||||
ADMIN_MEDIA_PREFIX = '/static/grappelli/'
|
|
||||||
GRAPPELLI_ADMIN_HEADLINE = "GestioCOF"
|
GRAPPELLI_ADMIN_HEADLINE = "GestioCOF"
|
||||||
GRAPPELLI_ADMIN_TITLE = "<a href=\"/\">GestioCOF</a>"
|
GRAPPELLI_ADMIN_TITLE = "<a href=\"/\">GestioCOF</a>"
|
||||||
|
|
||||||
|
@ -155,12 +152,12 @@ MAIL_DATA = {
|
||||||
'REPLYTO': 'BdA-Revente <bda-revente@ens.fr>'},
|
'REPLYTO': 'BdA-Revente <bda-revente@ens.fr>'},
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGIN_URL = "/gestion/login"
|
LOGIN_URL = "cof-login"
|
||||||
LOGIN_REDIRECT_URL = "/gestion/"
|
LOGIN_REDIRECT_URL = "home"
|
||||||
|
|
||||||
CAS_SERVER_URL = 'https://cas.eleves.ens.fr/'
|
CAS_SERVER_URL = 'https://cas.eleves.ens.fr/'
|
||||||
CAS_IGNORE_REFERER = True
|
CAS_IGNORE_REFERER = True
|
||||||
CAS_REDIRECT_URL = '/gestion/'
|
CAS_REDIRECT_URL = '/'
|
||||||
CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
|
CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
|
||||||
AUTHENTICATION_BACKENDS = (
|
AUTHENTICATION_BACKENDS = (
|
||||||
'django.contrib.auth.backends.ModelBackend',
|
'django.contrib.auth.backends.ModelBackend',
|
||||||
|
|
25
cof/urls.py
25
cof/urls.py
|
@ -24,7 +24,7 @@ from gestioncof.autocomplete import autocomplete
|
||||||
autocomplete_light.autodiscover()
|
autocomplete_light.autodiscover()
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
my_urlpatterns = [
|
urlpatterns = [
|
||||||
# Page d'accueil
|
# Page d'accueil
|
||||||
url(r'^$', gestioncof_views.home, name='home'),
|
url(r'^$', gestioncof_views.home, name='home'),
|
||||||
# Le BdA
|
# Le BdA
|
||||||
|
@ -48,7 +48,7 @@ my_urlpatterns = [
|
||||||
url(r'^cas/logout$', django_cas_views.logout),
|
url(r'^cas/logout$', django_cas_views.logout),
|
||||||
url(r'^outsider/login$', gestioncof_views.login_ext),
|
url(r'^outsider/login$', gestioncof_views.login_ext),
|
||||||
url(r'^outsider/logout$', django_views.logout, {'next_page': 'home'}),
|
url(r'^outsider/logout$', django_views.logout, {'next_page': 'home'}),
|
||||||
url(r'^login$', gestioncof_views.login),
|
url(r'^login$', gestioncof_views.login, name="cof-login"),
|
||||||
url(r'^logout$', gestioncof_views.logout),
|
url(r'^logout$', gestioncof_views.logout),
|
||||||
# Infos persos
|
# Infos persos
|
||||||
url(r'^profile$', gestioncof_views.profile),
|
url(r'^profile$', gestioncof_views.profile),
|
||||||
|
@ -81,14 +81,15 @@ my_urlpatterns = [
|
||||||
url(r'^utile_bda/bda_diff$', gestioncof_views.liste_bdadiff),
|
url(r'^utile_bda/bda_diff$', gestioncof_views.liste_bdadiff),
|
||||||
url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof),
|
url(r'^utile_cof/diff_cof$', gestioncof_views.liste_diffcof),
|
||||||
url(r'^utile_bda/bda_revente$', gestioncof_views.liste_bdarevente),
|
url(r'^utile_bda/bda_revente$', gestioncof_views.liste_bdarevente),
|
||||||
url(r'^k-fet/', include('kfet.urls'))
|
url(r'^k-fet/', include('kfet.urls')),
|
||||||
] + \
|
|
||||||
(static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
|
||||||
if settings.DEBUG
|
|
||||||
else [])
|
|
||||||
# Si on est en production, MEDIA_ROOT est servi par Apache.
|
|
||||||
# Il faut dire à Django de servir MEDIA_ROOT lui-même en développement.
|
|
||||||
|
|
||||||
urlpatterns = [
|
|
||||||
url(r'^gestion/', include(my_urlpatterns))
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if settings.DEBUG:
|
||||||
|
import debug_toolbar
|
||||||
|
urlpatterns += [
|
||||||
|
url(r'^__debug__/', include(debug_toolbar.urls)),
|
||||||
|
]
|
||||||
|
|
||||||
|
# Si on est en production, MEDIA_ROOT est servi par Apache.
|
||||||
|
# Il faut dire à Django de servir MEDIA_ROOT lui-même en développement.
|
||||||
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|
||||||
|
|
|
@ -8,7 +8,5 @@ from channels.routing import route, route_class
|
||||||
from kfet import consumers
|
from kfet import consumers
|
||||||
|
|
||||||
channel_routing = [
|
channel_routing = [
|
||||||
route_class(consumers.KPsul, path=r"^/gestion/ws/k-fet/k-psul/$"),
|
route_class(consumers.KPsul, path=r"^ws/k-fet/k-psul/$"),
|
||||||
#route("websocket.connect", ws_kpsul_history_connect),
|
|
||||||
#route('websocket.receive', ws_message)
|
|
||||||
]
|
]
|
||||||
|
|
|
@ -6,6 +6,16 @@
|
||||||
ProxyRequests Off
|
ProxyRequests Off
|
||||||
ProxyPass /static/ !
|
ProxyPass /static/ !
|
||||||
ProxyPass /media/ !
|
ProxyPass /media/ !
|
||||||
|
# Pour utiliser un sous-dossier (typiquement /gestion/), il faut faire a la
|
||||||
|
# place des lignes suivantes:
|
||||||
|
#
|
||||||
|
# RequestHeader set Daphne-Root-Path /gestion
|
||||||
|
# ProxyPass /gestion/ws/ ws://127.0.0.1:8001/gestion/ws/
|
||||||
|
# ProxyPass /gestion http://127.0.0.1:8001/gestion
|
||||||
|
# ProxyPassReverse /gestion http://127.0.0.1:8001/gestion
|
||||||
|
#
|
||||||
|
# Penser egalement a changer les /static/ et /media/ dans la config apache
|
||||||
|
# ainsi que dans les settings django.
|
||||||
ProxyPass /ws/ ws://127.0.0.1:8001/ws/
|
ProxyPass /ws/ ws://127.0.0.1:8001/ws/
|
||||||
ProxyPass / http://127.0.0.1:8001/
|
ProxyPass / http://127.0.0.1:8001/
|
||||||
ProxyPassReverse / http://127.0.0.1:8001/
|
ProxyPassReverse / http://127.0.0.1:8001/
|
||||||
|
|
|
@ -10,6 +10,7 @@ DBPASSWD="4KZt3nGPLVeWSvtBZPSM3fSzXpzEU4"
|
||||||
# Installation de paquets utiles
|
# Installation de paquets utiles
|
||||||
apt-get update && apt-get install -y mercurial python-pip python-dev \
|
apt-get update && apt-get install -y mercurial python-pip python-dev \
|
||||||
libmysqlclient-dev libjpeg-dev git redis-server
|
libmysqlclient-dev libjpeg-dev git redis-server
|
||||||
|
pip install -U pip
|
||||||
|
|
||||||
# Configuration et installation de mysql. Le mot de passe root est le même que
|
# Configuration et installation de mysql. Le mot de passe root est le même que
|
||||||
# le mot de passe pour l'utilisateur local - pour rappel, ceci est une instance
|
# le mot de passe pour l'utilisateur local - pour rappel, ceci est une instance
|
||||||
|
@ -23,7 +24,7 @@ mysql -uroot -p$DBPASSWD -e "CREATE DATABASE $DBNAME; GRANT ALL PRIVILEGES ON $D
|
||||||
|
|
||||||
# Installation et configuration d'Apache
|
# Installation et configuration d'Apache
|
||||||
apt-get install -y apache2
|
apt-get install -y apache2
|
||||||
a2enmod proxy proxy_http
|
a2enmod proxy proxy_http proxy_wstunnel headers
|
||||||
cp /vagrant/provisioning/apache.conf /etc/apache2/sites-available/gestiocof.conf
|
cp /vagrant/provisioning/apache.conf /etc/apache2/sites-available/gestiocof.conf
|
||||||
a2ensite gestiocof
|
a2ensite gestiocof
|
||||||
a2dissite 000-default
|
a2dissite 000-default
|
||||||
|
|
Loading…
Reference in a new issue