diff --git a/securityquiz/urls.py b/securityquiz/urls.py index 1ac9395..ffd7aa4 100644 --- a/securityquiz/urls.py +++ b/securityquiz/urls.py @@ -7,6 +7,7 @@ urlpatterns = patterns('', # Examples: url(r'^callback$', 'views.avans_callback'), url(r'^logout$', 'views.avans_logout'), + url(r'^pull$', 'views.git_pull'), url(r'^admin/', include(admin.site.urls)), url(r'^save$', 'views.save'), url(r'^sign$', 'views.sign'), diff --git a/views.py b/views.py index 17a8afc..fe415f0 100644 --- a/views.py +++ b/views.py @@ -7,7 +7,7 @@ from django.contrib.auth import authenticate, login, logout from django.contrib.auth.models import User from django.contrib import messages from quiz.models import Answer -import oauth2 as oauth, cgi, json, base64, urlparse +import oauth2 as oauth, cgi, json, base64, urlparse, subprocess import securityquiz.secrets as secrets import securityquiz.settings as settings @@ -20,6 +20,10 @@ AUTHORIZE_URL = 'https://publicapi.avans.nl/oauth/saml.php?oauth_token=%s' consumer = oauth.Consumer(AVANS_KEY, AVANS_SECRET) client = oauth.Client(consumer) +def git_pull(request): + output = subprocess.check_output(["git", "pull"]) + return HttpResponse(output) + def avans_login(request): resp, content = client.request(REQUEST_TOKEN_URL % request.get_host(), "GET") diff --git a/wsgi.py b/wsgi.py new file mode 100644 index 0000000..6d3db33 --- /dev/null +++ b/wsgi.py @@ -0,0 +1,10 @@ +import os, sys + +path = os.path.dirname(os.path.abspath(__file__)) +if path not in sys.path: + sys.path.append(path) + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "securityquiz.settings") + +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application()