aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2012-01-17 07:12:09 +0000
committerMichael Elkins <melkins@tislabs.com>2012-01-17 07:12:09 +0000
commit7443ea5a9845235f531dfe16b3b430cbcc86cb8b (patch)
tree6408725384be5d6073a379925be6749f3fd5e36d
parentf72cb1394d0ca3ac0019f829d440392415906e12 (diff)
remove django admin site from installed apps
svn path=/branches/tk161/; revision=4202
-rw-r--r--rpkid/portal-gui/settings.py.in4
-rw-r--r--rpkid/rpki/gui/app/admin.py28
2 files changed, 2 insertions, 30 deletions
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
index 22c92b74..186f3f1d 100644
--- a/rpkid/portal-gui/settings.py.in
+++ b/rpkid/portal-gui/settings.py.in
@@ -70,8 +70,8 @@ ROOT_URLCONF = 'rpki.gui.urls'
INSTALLED_APPS = (
'django.contrib.auth',
- 'django.contrib.admin',
- 'django.contrib.admindocs',
+ #'django.contrib.admin',
+ #'django.contrib.admindocs',
'django.contrib.contenttypes',
'django.contrib.sessions',
'rpki.irdb',
diff --git a/rpkid/rpki/gui/app/admin.py b/rpkid/rpki/gui/app/admin.py
deleted file mode 100644
index 6ad78fda..00000000
--- a/rpkid/rpki/gui/app/admin.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-$Id$
-
-Copyright (C) 2010, 2011 SPARTA, Inc. dba Cobham Analytic Solutions
-Copyright (C) 2012 SPARTA, Inc. a Parsons Company
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND SPARTA DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL SPARTA BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-"""
-
-from django.contrib import admin
-from rpki.gui.app import models
-
-class TimestampAdmin(admin.ModelAdmin):
- list_display = ('name', 'ts')
-
-admin.site.register(models.Timestamp, TimestampAdmin)
-
-# vim:sw=4 ts=8