Commit 348febee authored by Leonidas Poulopoulos's avatar Leonidas Poulopoulos
Browse files

Project refactoring from eduroam to djnro

parent 701d1907
# Makefile for DjNRO (eduroam)
# Makefile for DjNRO
#
# You can set these variables from the command line.
......@@ -15,8 +15,8 @@ PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS)
SPHINXFILES = $(DOCSDIR)/$(SRCDIR)/*
eduroampytag = $(shell git describe --abbrev=0)
eduroampyver = $(shell git describe --abbrev=0 | egrep -o '([0-9]+\.){1,10}[0-9]+' | sed -e 's/\./_/g')
djnropytag = $(shell git describe --abbrev=0)
djnropyver = $(shell git describe --abbrev=0 | egrep -o '([0-9]+\.){1,10}[0-9]+' | sed -e 's/\./_/g')
name = $(shell basename $(shell pwd))
.PHONY: help doc docclean dist distclean
......@@ -30,8 +30,8 @@ help:
@echo " distclean to delete tar dist file"
dist:
git archive --format tar --prefix $(name)-$(eduroampyver)/ -o $(name)-$(eduroampyver).tar $(eduroampytag)
gzip -f $(name)-$(eduroampyver).tar
git archive --format tar --prefix $(name)-$(djnropyver)/ -o $(name)-$(djnropyver).tar $(djnropytag)
gzip -f $(name)-$(djnropyver).tar
distclean:
@rm -f *tar.gz
......
......@@ -2,9 +2,9 @@ import os
import sys
sys.path.append('/path/to/')
sys.path.append('/path/to/eduroam')
sys.path.append('/path/to/djnro')
os.environ['DJANGO_SETTINGS_MODULE'] = 'eduroam.settings'
os.environ['DJANGO_SETTINGS_MODULE'] = 'djnro.settings'
......
......@@ -27,7 +27,7 @@ Installation and customization is fairly easy and is described in the following
Currently the source code is availiable at code.grnet.gr and can be cloned via git::
git clone https://code.grnet.gr/git/eduroam
git clone https://code.grnet.gr/git/djnro
The Greek eduroam webpage is a living example of DjNRO: `eduroam|gr <http://www.eduroam.gr>`_
......
......@@ -4,11 +4,11 @@ Installation/Configuration
=========================================================================
.. contents::
Assuming that you have installed all the required packages as described in :ref:`require-label` you can install the eduroam platform application.
Assuming that you have installed all the required packages as described in :ref:`require-label` you can install the djnro platform application.
Currently the source code is availiable at code.grnet.gr and can be cloned via git::
git clone https://code.grnet.gr/git/eduroam
git clone https://code.grnet.gr/git/djnro
As with the majority of Django projects, settings.py has to be properly configured and then comes the population of the database.
......@@ -49,7 +49,7 @@ Set your static url::
Django social auth needs changes in the Authentication Backends depending on which social auth you want to enable::
AUTHENTICATION_BACKENDS = (
'eduroam.djangobackends.shibauthBackend.shibauthBackend',
'djnro.djangobackends.shibauthBackend.shibauthBackend',
...
'django.contrib.auth.backends.ModelBackend',
)
......@@ -190,8 +190,8 @@ Running the server
We suggest going via Apache with mod_wsgi. Below is an example configuration::
WSGIDaemonProcess eduroam processes=3 threads=20 display-name=%{GROUP}
WSGIProcessGroup eduroam
WSGIDaemonProcess djnro processes=3 threads=20 display-name=%{GROUP}
WSGIProcessGroup djnro
...
......@@ -224,8 +224,8 @@ We suggest going via Apache with mod_wsgi. Below is an example configuration::
</Location>
Alias /static /path/to/eduroam/static
WSGIScriptAlias / /path/to/eduroam/apache/django.wsgi
Alias /static /path/to/djnro/static
WSGIScriptAlias / /path/to/djnro/apache/django.wsgi
</VirtualHost>
*Info*: It is strongly suggested to allow access to /admin|overview|alt-login *ONLY* from trusted subnets.
......
......@@ -27,7 +27,7 @@ Django Social Auth
User authentication via social media is carried out by the `python-django-social-auth <http://http://django-social-auth.readthedocs.org/en/latest/index.html>`_ python-django-social-auth package. If your distro includes it, then go via your distro installation.
In any case we have included python-django-social-auth as an application inside the eduroam Django project.
In any case we have included python-django-social-auth as an application inside the djnro Django project.
Django Social Auth: Requirements - Dependencies
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
......
# -*- coding: utf-8 -*-.
from django.contrib import admin
from eduroam.edumanage.models import *
from edumanage.models import *
from django.contrib.contenttypes import generic
......
......@@ -8,7 +8,7 @@ from django.conf import settings
class Command(BaseCommand):
args = ''
help = 'Fetches the kml from eduroam.org and updates cache'
help = 'Parses the institution XML file and creates institution, institution realm, contact and service point entries'
def handle(self, *args, **options):
file = settings.INST_XML_FILE
......
# Django settings for eduroam project.
# Django settings for djnro project.
# -*- coding: utf-8 -*- vim:fileencoding=utf-8:
# vim: tabstop=4:shiftwidth=4:softtabstop=4:expandtab
#Copyright © 2011-2013 Greek Research and Technology Network (GRNET S.A.)
......@@ -95,8 +95,8 @@ SECRET_KEY = 'x)gmuyo2h=l@tmpyh4b(-!gki%@u$-=3^@z+vf&&!ci7$*!+k9'
AUTHENTICATION_BACKENDS = (
'eduroam.djangobackends.shibauthBackend.shibauthBackend',
'eduroam.djangobackends.ldapBackend.ldapBackend',
'djnro.djangobackends.shibauthBackend.shibauthBackend',
'djnro.djangobackends.ldapBackend.ldapBackend',
'social_auth.backends.twitter.TwitterBackend',
#'social_auth.backends.facebook.FacebookBackend',
'social_auth.backends.google.GoogleBackend',
......@@ -141,7 +141,7 @@ MIDDLEWARE_CLASSES = (
'edumanage.middleware.WrongBackendExceptionMiddleware',
)
ROOT_URLCONF = 'eduroam.urls'
ROOT_URLCONF = 'djnro.urls'
TEMPLATE_DIRS = (
"/example/templates"
......
......@@ -16,8 +16,8 @@ urlpatterns = patterns('',
# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
url(r'^managelogin/(?P<backend>[^/]+)/$', 'eduroam.edumanage.views.manage_login', name='manage_login'),
url(r'^login/?', 'eduroam.edumanage.views.user_login', name="login"),
url(r'^managelogin/(?P<backend>[^/]+)/$', 'edumanage.views.manage_login', name='manage_login'),
url(r'^login/?', 'edumanage.views.user_login', name="login"),
url(r'^altlogin/?', 'django.contrib.auth.views.login', {'template_name': 'overview/login.html'}, name="altlogin"),
url(r'^logout/?', 'django.contrib.auth.views.logout', {'next_page': '/'}, name="logout"),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment