summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorexpo <expo@expobox.potato.hut>2015-06-24 04:41:50 +0100
committerexpo <expo@expobox.potato.hut>2015-06-24 04:41:50 +0100
commitdcc67fddda039e10cf0c81a8925373acea2b7be4 (patch)
treee8f9b453a9063e208a72e7de3ed44dd159accb30
parent03cad0a37f01be8bb2b82de8f566771579f656fb (diff)
downloadtroggle-dcc67fddda039e10cf0c81a8925373acea2b7be4.tar.gz
troggle-dcc67fddda039e10cf0c81a8925373acea2b7be4.tar.bz2
troggle-dcc67fddda039e10cf0c81a8925373acea2b7be4.zip
Don't put passwords in the repo
-rw-r--r--databaseReset.py2
-rw-r--r--localsettingspotatohut.py7
-rw-r--r--localsettingsubuntu.py2
3 files changed, 8 insertions, 3 deletions
diff --git a/databaseReset.py b/databaseReset.py
index b577fda..3a64135 100644
--- a/databaseReset.py
+++ b/databaseReset.py
@@ -26,7 +26,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', '161:gosser')
+ user = User.objects.create_user('expo', 'wookey@wookware.org', 'putrealpasswordinhere')
user.is_staff = True
user.is_superuser = True
user.save()
diff --git a/localsettingspotatohut.py b/localsettingspotatohut.py
index 2676da9..5773816 100644
--- a/localsettingspotatohut.py
+++ b/localsettingspotatohut.py
@@ -1,11 +1,15 @@
import sys
+# This is an example file. Copy it to localsettings.py, set the
+# password and _don't_ check that file back to the repo as it exposes
+# your/our password to the world!
+
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
'NAME': 'troggle', # Or path to database file if using sqlite3.
'USER': 'expo', # Not used with sqlite3.
- 'PASSWORD': '161:gosser', # Not used with sqlite3.
+ 'PASSWORD': 'wibble', # Not used with sqlite3.
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
'PORT': '', # Set to empty string for default. Not used with sqlite3.
}
@@ -16,6 +20,7 @@ sys.path.append(REPOS_ROOT_PATH)
sys.path.append(REPOS_ROOT_PATH + 'troggle')
PUBLIC_SITE = True
+FIX_PERMISSIONS = ["sudo", "/usr/local/bin/fix_permissions"]
SURVEX_DATA = REPOS_ROOT_PATH + 'loser/'
TUNNEL_DATA = REPOS_ROOT_PATH + 'tunneldata/'
diff --git a/localsettingsubuntu.py b/localsettingsubuntu.py
index eac75da..265a4d3 100644
--- a/localsettingsubuntu.py
+++ b/localsettingsubuntu.py
@@ -6,7 +6,7 @@ DATABASES = {
'ENGINE': 'django.db.backends.mysql', # 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
'NAME' : 'troggle', # Or path to database file if using sqlite3.
'USER' : 'expo', # Not used with sqlite3.
- 'PASSWORD' : '161:gosser', # Not used with sqlite3.
+ 'PASSWORD' : 'sekrit', # Not used with sqlite3.
'HOST' : '', # Set to empty string for localhost. Not used with sqlite3.
'PORT' : '', # Set to empty string for default. Not used with sqlite3.
}