Merged production settings into svn version of settings.py, except for the DATABASE_PASSWORD. *Set this in settings_local.py, do not edit settings.py*. See adamlaska#208.

 - Legacy-Id: 888

Author: levkowetz

ietf/settings.py

@@ -28,19 +28,21 @@
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'mysql'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
-DATABASE_NAME = 'django_idtracker'             # Or path to database file if using sqlite3.
-DATABASE_USER = 'django'             # Not used with sqlite3.
-DATABASE_PASSWORD = 'playing'         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_ENGINE = 'mysql'      # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+DATABASE_NAME = 'ietf'         # Or path to database file if using sqlite3.
+DATABASE_USER = 'django'       # Not used with sqlite3.
+#DATABASE_PASSWORD = 'playing' # Not used with sqlite3.
 DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+#DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+#DATABASE_HOST = '10.30.47.10' 	   # The MySQL 5 server, new and hot.. but seems to be slow
+DATABASE_HOST = '10.31.47.10'      # Existing MySQL 4.1 server.. 
 
 # Local time zone for this installation. Choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
 # although not all variations may be possible on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'America/Los_Angeles'
+TIME_ZONE = 'America/New_York'
 
 # Language code for this installation. All choices can be found here:
 # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
@@ -157,7 +159,7 @@
 # The name of the method to use to invoke the test suite
 TEST_RUNNER = 'ietf.tests.run_tests'
 
-IPR_DOCUMENT_PATH = '/home/master-site/ftp/data/ietf/IPR'
+IPR_DOCUMENT_PATH = '/home/local/ftp/data/ietf/IPR'
 
 TEST_REFERENCE_URL_PREFIX = 'http://compost.research.att.com/old/'