# HG changeset patch # User Marcin Kuzminski # Date 2010-09-12 20:42:03 # Node ID 91292686c1edb8dcf9e503a3e2f69930aabbc7cc # Parent ac559565c6b8e51211248475da81ee0a94e9c3c4 updated config files, and added celery dependency diff --git a/production.ini b/production.ini --- a/production.ini +++ b/production.ini @@ -1,28 +1,33 @@ ################################################################################ ################################################################################ -# pylons_app - Pylons environment configuration # +# hg-app - Pylons environment configuration # # # # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ [DEFAULT] debug = true -############################################ -## Uncomment and replace with the address ## -## which should receive any error reports ## -############################################ +################################################################################ +## Uncomment and replace with the address which should receive ## +## any error reports after application crash ## +## Additionally those settings will be used by hg-app mailing system ## +################################################################################ #email_to = admin@localhost +#error_email_from = paste_error@localhost +#app_email_from = hg-app-noreply@localhost +#error_message = + #smtp_server = mail.server.com -#error_email_from = paste_error@localhost #smtp_username = #smtp_password = -#error_message = 'mercurial crash !' +#smtp_port = +#smtp_use_tls = false [server:main] ##nr of threads to spawn threadpool_workers = 5 -##max request before +##max request before thread respawn threadpool_max_requests = 2 ##option to use threads of process diff --git a/pylons_app/config/deployment.ini_tmpl b/pylons_app/config/deployment.ini_tmpl --- a/pylons_app/config/deployment.ini_tmpl +++ b/pylons_app/config/deployment.ini_tmpl @@ -7,16 +7,21 @@ [DEFAULT] debug = true -############################################ -## Uncomment and replace with the address ## -## which should receive any error reports ## -############################################ +################################################################################ +## Uncomment and replace with the address which should receive ## +## any error reports after application crash ## +## Additionally those settings will be used by hg-app mailing system ## +################################################################################ #email_to = admin@localhost +#error_email_from = paste_error@localhost +#app_email_from = hg-app-noreply@localhost +#error_message = + #smtp_server = mail.server.com -#error_email_from = paste_error@localhost #smtp_username = #smtp_password = -#error_message = 'hp-app crash !' +#smtp_port = +#smtp_use_tls = false [server:main] ##nr of threads to spawn diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -26,6 +26,7 @@ setup( "pysqlite", "whoosh==1.0.0b10", "py-bcrypt", + "celery", ], setup_requires=["PasteScript>=1.6.3"], packages=find_packages(exclude=['ez_setup']), diff --git a/tests.ini b/tests.ini --- a/tests.ini +++ b/tests.ini @@ -1,28 +1,33 @@ ################################################################################ ################################################################################ -# pylons_app - Pylons environment configuration # +# hg-app - Pylons environment configuration # # # # The %(here)s variable will be replaced with the parent directory of this file# ################################################################################ [DEFAULT] debug = true -############################################ -## Uncomment and replace with the address ## -## which should receive any error reports ## -############################################ +################################################################################ +## Uncomment and replace with the address which should receive ## +## any error reports after application crash ## +## Additionally those settings will be used by hg-app mailing system ## +################################################################################ #email_to = admin@localhost +#error_email_from = paste_error@localhost +#app_email_from = hg-app-noreply@localhost +#error_message = + #smtp_server = mail.server.com -#error_email_from = paste_error@localhost #smtp_username = #smtp_password = -#error_message = 'mercurial crash !' +#smtp_port = +#smtp_use_tls = false [server:main] ##nr of threads to spawn threadpool_workers = 5 -##max request before +##max request before thread respawn threadpool_max_requests = 2 ##option to use threads of process @@ -56,7 +61,7 @@ beaker.cache.super_short_term.expire=10 ### BEAKER SESSION #### #################################### ## Type of storage used for the session, current types are -## “dbm”, “file”, “memcached”, “database”, and “memory”. +## "dbm", "file", "memcached", "database", and "memory". ## The storage uses the Container API ##that is also used by the cache system. beaker.session.type = file