From 83168f3aed651a2591cdaeb6e76ea50e18c73af3 Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Thu, 21 Mar 2013 12:09:49 +0100 Subject: [PATCH] pffedportal: add /licences and /conditions pages --- virtualenv/etc/lighttpd-pffedportal.conf | 2 +- virtualenv/pffedportal/urls.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/virtualenv/etc/lighttpd-pffedportal.conf b/virtualenv/etc/lighttpd-pffedportal.conf index 2c77f26..b7986c0 100644 --- a/virtualenv/etc/lighttpd-pffedportal.conf +++ b/virtualenv/etc/lighttpd-pffedportal.conf @@ -45,7 +45,7 @@ $SERVER["socket"] == ":443" { ) url.rewrite-once = ( "^/*$" => "/pffedportal.fcgi/", - "^/(login|logout|sso|authsaml2|mail|admin)(.*)$" => "/pffedportal.fcgi/$1$2", + "^/(login|logout|sso|authsaml2|mail|admin|licences|conditions)(.*)$" => "/pffedportal.fcgi/$1$2", ) fastcgi.server = ( "/pffedportal.fcgi" => (( diff --git a/virtualenv/pffedportal/urls.py b/virtualenv/pffedportal/urls.py index 7ffb26c..88f6f5b 100644 --- a/virtualenv/pffedportal/urls.py +++ b/virtualenv/pffedportal/urls.py @@ -10,6 +10,11 @@ urlpatterns = patterns('', (r'^authsaml2/', include('authentic2.authsaml2.urls')), ) +urlpatterns += patterns('django.views.generic.simple', + (r'^licences$', 'direct_to_template', {'template': 'licences.html'}), + (r'^conditions$', 'direct_to_template', {'template': 'conditions.html'}), +) + if settings.EMAIL_RCPT and settings.EMAIL_HOST: urlpatterns += patterns('', url(r'^mail$', 'base.views.mail'))