Merge from trunk.

This commit is contained in:
Raoul Snyman 2010-04-12 08:19:44 +02:00
commit bc469f49d8

View File

@ -22,6 +22,7 @@ static_files = true
cache_dir = %(here)s/data cache_dir = %(here)s/data
beaker.session.key = scribeengine beaker.session.key = scribeengine
beaker.session.secret = ${app_instance_secret} beaker.session.secret = ${app_instance_secret}
beaker.session.timeout = 1209600
app_instance_uuid = ${app_instance_uuid} app_instance_uuid = ${app_instance_uuid}
# If you'd like to fine-tune the individual locations of the cache data dirs # If you'd like to fine-tune the individual locations of the cache data dirs
@ -33,6 +34,25 @@ app_instance_uuid = ${app_instance_uuid}
# SQLAlchemy database URL # SQLAlchemy database URL
sqlalchemy.url = sqlite:///production.db sqlalchemy.url = sqlite:///production.db
# Images directory
paths.images = %(here)s/images
# Themes directory
paths.themes = %(here)s/themes
# Security settings
security.salt = secretsalt
# Mail server settings
mail.on = false
mail.manager = immediate
mail.transport = smtp
mail.smtp.server = mail.mydomain.com
mail.smtp.username = mymailusername
mail.smtp.password = mymailpassword
# Server-related settings
server.timezone = 'Africa/Johannesburg'
# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* # WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*
# Debug mode will enable the interactive debugging tool, allowing ANYONE to # Debug mode will enable the interactive debugging tool, allowing ANYONE to
# execute malicious code after an exception is raised. # execute malicious code after an exception is raised.