diff options
| author | Michael Elkins <melkins@tislabs.com> | 2011-11-23 19:18:33 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2011-11-23 19:18:33 +0000 |
| commit | d77217b8a46682154e45f9cd72b3ce83958ed465 (patch) | |
| tree | 6c825fd36a511104289d08064a40af7d0c867ac5 /rpkid/portal-gui | |
| parent | f370e8316a35fd444c662179798dd4f8da490ca0 (diff) | |
remove features that depend on django 1.3, so that portal gui works with django 1.2
svn path=/trunk/; revision=4093
Diffstat (limited to 'rpkid/portal-gui')
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 2 | ||||
| -rw-r--r-- | rpkid/portal-gui/apache/rpki.conf.in | 14 | ||||
| -rw-r--r-- | rpkid/portal-gui/settings.py.in | 10 |
3 files changed, 15 insertions, 11 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 9265e877..fa4e1e46 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -73,7 +73,7 @@ install-data: $(BUILD) install-apache ${INSTALL} -m 644 settings.py ${PYTHONPATH}/settings.py.new; \ fi $(DJANGO_ADMIN) syncdb --pythonpath ${PYTHONPATH} --settings settings - $(DJANGO_ADMIN) collectstatic --noinput --pythonpath ${PYTHONPATH} --settings settings + #$(DJANGO_ADMIN) collectstatic --noinput --pythonpath ${PYTHONPATH} --settings settings if [ ! -f $(INSTDIR)/rpki.conf.template ]; then ${INSTALL} -m 644 ../examples/rpki.conf $(INSTDIR)/rpki.conf.template; fi install: install-data install-perms diff --git a/rpkid/portal-gui/apache/rpki.conf.in b/rpkid/portal-gui/apache/rpki.conf.in index 064b55e0..9318549a 100644 --- a/rpkid/portal-gui/apache/rpki.conf.in +++ b/rpkid/portal-gui/apache/rpki.conf.in @@ -19,10 +19,14 @@ Order deny,allow Allow from all </Directory> -Alias /static/ @STATIC_DIR@/ -<Directory @STATIC_DIR@> -Order allow,deny -Allow from all -</Directory> +# for use with Django 1.3+ +#Alias /static/ @STATIC_DIR@/ +#<Directory @STATIC_DIR@> +#Order allow,deny +#Allow from all +#</Directory> + +# for use with Django 1.2 +#Alias /media/ /var/www/html/media/ # vim:ft=apache diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in index 243cef56..2800bc24 100644 --- a/rpkid/portal-gui/settings.py.in +++ b/rpkid/portal-gui/settings.py.in @@ -54,7 +54,7 @@ INSTALLED_APPS = ( 'django.contrib.admindocs', 'django.contrib.contenttypes', 'django.contrib.sessions', - 'django.contrib.staticfiles', +# 'django.contrib.staticfiles', 'rpki.gui.app', 'rpki.gui.cacheview' ) @@ -68,7 +68,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.request" ) -STATIC_URL = '/static/' -STATIC_ROOT = '%(AC_DATAROOTDIR)s/rpki/gui/static' -STATICFILES_DIRS = (("admin", "%(AC_DJANGO_DIR)s/contrib/admin/media"),) -STATICFILES_FINDERS = ("django.contrib.staticfiles.finders.FileSystemFinder",) +#STATIC_URL = '/static/' +#STATIC_ROOT = '%(AC_DATAROOTDIR)s/rpki/gui/static' +#STATICFILES_DIRS = (("admin", "%(AC_DJANGO_DIR)s/contrib/admin/media"),) +#STATICFILES_FINDERS = ("django.contrib.staticfiles.finders.FileSystemFinder",) |