aboutsummaryrefslogtreecommitdiff
path: root/rpkid/portal-gui/scripts
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2011-11-10 05:55:19 +0000
committerMichael Elkins <melkins@tislabs.com>2011-11-10 05:55:19 +0000
commit82cdb46860033738cff0ebc77ea6af75fd66fbb5 (patch)
tree9f865e7019ff5f325361fc7285b49ea822d51533 /rpkid/portal-gui/scripts
parentebe3f9b8e6c12a578a5c8a62d60f10fa1b3b411b (diff)
move settings.py for portal gui django app to ${sysconfdir}/rpki since it really is a configuration file
svn path=/branches/tk103/; revision=4078
Diffstat (limited to 'rpkid/portal-gui/scripts')
-rw-r--r--rpkid/portal-gui/scripts/adduser.py5
-rwxr-xr-xrpkid/portal-gui/scripts/load_csv.py3
-rw-r--r--rpkid/portal-gui/scripts/rpkigui-rcynic.py4
3 files changed, 1 insertions, 11 deletions
diff --git a/rpkid/portal-gui/scripts/adduser.py b/rpkid/portal-gui/scripts/adduser.py
index 5ce8ab76..b06c6bc4 100644
--- a/rpkid/portal-gui/scripts/adduser.py
+++ b/rpkid/portal-gui/scripts/adduser.py
@@ -20,15 +20,10 @@
#
# DO NOT EDIT! This script is automatically generated from adduser.py
-import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
from django.contrib.auth.models import User
from rpki.gui.app import settings
from rpki.gui.app.models import Conf
-import os
-import sys
import getpass
import pwd
diff --git a/rpkid/portal-gui/scripts/load_csv.py b/rpkid/portal-gui/scripts/load_csv.py
index 44d08829..9d4fc1ac 100755
--- a/rpkid/portal-gui/scripts/load_csv.py
+++ b/rpkid/portal-gui/scripts/load_csv.py
@@ -23,9 +23,6 @@
# for the handle you are loading data
#
-import os
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
import csv
import socket # for socket.error
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index c7a0136e..3dc0d9bd 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -17,9 +17,7 @@
default_logfile = '/var/rcynic/data/summary.xml'
default_root = '/var/rcynic/data'
-import os, sys, time, vobject
-os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings'
-
+import time, vobject
from rpki.gui.cacheview import models
from rpki.rcynic import rcynic_xml_iterator, label_iterator
from rpki.sundial import datetime