diff --git a/databaseReset.py b/databaseReset.py index 3a64135..7cdc44f 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -12,6 +12,9 @@ from core.models import Cave, Entrance import flatpages.models databasename=settings.DATABASES['default']['NAME'] +expouser=settings.EXPOUSER +expouserpass=settings.EXPOUSERPASS +expouseremail=settings.SYSADMIN_EMAIL def reload_db(): if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3': @@ -26,7 +29,7 @@ def reload_db(): cursor.execute("ALTER DATABASE %s CHARACTER SET=utf8" % databasename) cursor.execute("USE %s" % databasename) management.call_command('syncdb', interactive=False) - user = User.objects.create_user('expo', 'wookey@wookware.org', 'putrealpasswordinhere') + user = User.objects.create_user(expouser, expouseremail, expouserpass) user.is_staff = True user.is_superuser = True user.save() diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py index 5773816..85488c7 100644 --- a/localsettingspotatohut.py +++ b/localsettingspotatohut.py @@ -15,6 +15,10 @@ DATABASES = { } } +EXPOUSER = 'expo' +EXPOUSERPASS = 'realpasshere' +EXPOUSER_EMAIL = 'wookey@wookware.org' + REPOS_ROOT_PATH = '/home/expo/' sys.path.append(REPOS_ROOT_PATH) sys.path.append(REPOS_ROOT_PATH + 'troggle') diff --git a/localsettingsserver.py b/localsettingsserver.py index 67a69e6..fe1b013 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -14,6 +14,10 @@ DATABASES = { } } +EXPOUSER = 'expo' +EXPOUSERPASS = 'realpasshere' +EXPOUSER_EMAIL = 'wookey@wookware.org' + REPOS_ROOT_PATH = '/home/expo/' sys.path.append(REPOS_ROOT_PATH) sys.path.append(REPOS_ROOT_PATH + 'troggle') diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py index a6f3685..a50d208 100644 --- a/localsettingsubuntu.py +++ b/localsettingsubuntu.py @@ -12,6 +12,10 @@ DATABASES = { } } +EXPOUSER = 'expo' +EXPOUSERPASS = 'realpasshere' +EXPOUSER_EMAIL = 'wookey@wookware.org' + REPOS_ROOT_PATH = '/home/expo/expofiles/' sys.path.append(REPOS_ROOT_PATH) diff --git a/localsettingswindows.py b/localsettingswindows.py index 578b152..bb689e6 100644 --- a/localsettingswindows.py +++ b/localsettingswindows.py @@ -9,6 +9,10 @@ DATABASES = { } } +EXPOUSER = 'expo' +EXPOUSERPASS = 'realpasshere' +EXPOUSER_EMAIL = 'wookey@wookware.org' + SURVEX_DATA = 'c:\\Expo\\loser\\' CAVERN = 'cavern' THREEDTOPOS = '3dtopos'