diff -r 02e81a3fc99b -r 606972cc4e2f dev/modules/sysconfig/templates/config.py.erb --- a/dev/modules/sysconfig/templates/config.py.erb Wed Oct 01 13:14:23 2014 +0200 +++ b/dev/modules/sysconfig/templates/config.py.erb Wed Oct 01 13:14:55 2014 +0200 @@ -53,14 +53,14 @@ DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.%(db_engine)s', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': '%(db_name)s', # Or path to database file if using sqlite3. - 'USER': '%(db_user)s', # Not used with sqlite3. - 'PASSWORD': '%(db_password)s', # Not used with sqlite3. - 'HOST': '%(db_host)s', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '%(db_port)d', # Set to empty string for default. Not used with sqlite3. - } + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', # YOUR_SETTINGS # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': '<%= @db_name %>', # YOUR_SETTINGS # Or path to database file if using sqlite3. + 'USER': '<%= @db_user %>', # YOUR_SETTINGS # Not used with sqlite3. + 'PASSWORD': '<%= @db_pw %>', # YOUR_SETTINGS # Not used with sqlite3. + 'HOST': '<%= @db_host %>', # YOUR_SETTINGS # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '<%= @db_port %>', # YOUR_SETTINGS # Set to empty string for default. Not used with sqlite3. + } } CACHES = { @@ -73,7 +73,7 @@ TEMPLATE_DEBUG = DEBUG #LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../../run/log/log.txt")) -LOG_FILE = '%(log_file)s' +LOG_FILE = 'log.txt' LOG_LEVEL = logging.DEBUG LOGGING = { 'version': 1, @@ -141,11 +141,11 @@ GOOGLE_ANALYTICS_CODE = '%(google_analytics_code)s' -EMAIL_USE_TLS = %(email_use_tls)s +EMAIL_USE_TLS = '%(email_use_tls)s' EMAIL_HOST = '%(email_host)s' EMAIL_HOST_USER = '%(email_host_user)s' EMAIL_HOST_PASSWORD = '%(email_host_user)s' -EMAIL_PORT = %(email_port)d +EMAIL_PORT = '%(email_port)d' ACCOUNT_ACTIVATION_DAYS = 7 REGISTRATION_OPEN = False @@ -171,9 +171,9 @@ HAYSTACK_CONNECTIONS = { 'default': { #for elasticsearch use ldt.indexation.backends.elasticsearch_backend.ElasticsearchSearchEngine - 'ENGINE': 'haystack.backends.simple_backend.SimpleEngine', - #'URL': 'http://127.0.0.1:9200/', - #'INDEX_NAME': 'spel', + 'ENGINE': 'ldt.indexation.backends.elasticsearch_backend.ElasticsearchSearchEngine', + 'URL': 'http://127.0.0.1:9200/', + 'INDEX_NAME': 'spel', }, }