diff --git a/py-i2phosts-injector b/py-i2phosts-injector index fcc179e..509aea5 100755 --- a/py-i2phosts-injector +++ b/py-i2phosts-injector @@ -3,17 +3,9 @@ import os import sys import argparse -from django.core.exceptions import ValidationError import configobj -# django setup -DJANGO_SETTINGS_MODULE = 'settings' -DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' -sys.path.insert(1, DJANGO_PROJECT_PATH) -os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE -from web.postkey.models import i2phost -from web.lib.validation import validate_hostname -from web.lib.validation import validate_b64hash +from django.core.exceptions import ValidationError # parse command line options parser = argparse.ArgumentParser( @@ -39,6 +31,18 @@ if 'include' in config: config_included = configobj.ConfigObj(config['include']) config.merge(config_included) +# django setup +DJANGO_SETTINGS_MODULE = 'settings' +if 'DJANGO_PROJECT_PATH' in config: + DJANGO_PROJECT_PATH = config['DJANGO_PROJECT_PATH'] +else: + DJANGO_PROJECT_PATH = os.path.dirname(sys.argv[0]) + '/web' +sys.path.insert(1, DJANGO_PROJECT_PATH) +os.environ['DJANGO_SETTINGS_MODULE'] = DJANGO_SETTINGS_MODULE +from web.postkey.models import i2phost +from web.lib.validation import validate_hostname +from web.lib.validation import validate_b64hash + # determine approve hosts or not if args.approve: approved = True