production.ini | 176 -------------------------------------------------- sample-production.ini | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+), 176 deletions(-)
New commits: commit 5b6930c05f3ad198eff7ce62c7f9e724700a1195 Author: Luke Macken lmacken@redhat.com Date: Thu Mar 12 13:35:21 2009 -0400
Rename our production.ini to sample-production.ini, so it doesn't get in the way
diff --git a/production.ini b/production.ini deleted file mode 100644 index b287a2d..0000000 --- a/production.ini +++ /dev/null @@ -1,176 +0,0 @@ -# -# moksha - Pylons development environment configuration -# -# The %(here)s variable will be replaced with the parent directory of this file -# -# This file is for deployment specific config options -- other configuration -# that is always required for the app is done in the config directory, -# and generally should not be modified by end users. - -[DEFAULT] -debug = false -# Uncomment and replace with the address which should receive any error reports -#email_to = you@yourdomain.com -smtp_server = localhost -error_email_from = paste@localhost - -## -## Moksha-specific configuration options -## - -# Where to store the feed caches. -feed_cache = postgres://moksha:m0ksh4@localhost/moksha_feeds - -# -# Feed Streamer settings -# - -# Max age (in seconds) of each feed in the cache -feed.max_age = 900 - -# Timeout in seconds for the web request -feed.timeout = 30 - -# The number of simultaneous connections -feed.deferred_groups = 10 - -# Where to initialize and store our application databases. %s is the app name. -app_db = sqlite:///%s.db - -# The location of our Orbited server -orbited_host = localhost -orbited_port = 9000 - -# Stomp broker configuration. -stomp_broker = localhost -stomp_port = 61613 -stomp_user = guest -stomp_pass = guest - -# Optional AMQP Broker. -#amqp_broker = guest/guest@localhost - -# Documentation directory -docs_dir = /srv/moksha/docs - -# Moksha chat configuration - -# Use a built-in IRC server -#chat.backend = irc://localhost:9999 -#chat.builtin = true -chat.backend = irc://irc.freenode.net:6667 -chat.rooms = default -chat.default.staticRoomName = moksha -chat.default.roomAssignmentMode = static -chat.default.display.greeting = Moksha Chat -#chat.default.display.floating = true -#chat.default.display.floatingToggle = false -#chat.default.display.width = 400 -#chat.default.display.height = 300 -#chat.default.display.theme = simple -#chat.default.display.resizable = true - -[server:main] -use = egg:Paste#http -host = 0.0.0.0 -port = 8080 - -[app:main] -use = egg:moksha -full_stack = true -#lang = ru -cache_dir = %(here)s/data -beaker.session.key = moksha -beaker.session.secret = somesecret - -beaker.cache.type = ext:memcached -beaker.cache.url = localhost:11211 - -# If you'd like to fine-tune the individual locations of the cache data dirs -# for the Cache data, or the Session saves, un-comment the desired settings -# here: -#beaker.cache.data_dir = %(here)s/data/cache -#beaker.session.data_dir = %(here)s/data/sessions - - - -# pick the form for your database -# %(here) may include a ':' character on Windows environments; this can -# invalidate the URI when specifying a SQLite db via path name -sqlalchemy.url=postgres://moksha:m0ksh4@localhost/moksha -# sqlalchemy.url=mysql://username:password@hostname:port/databasename - - -# If you have sqlite, here's a simple default to get you started -# in development - -#sqlalchemy.url = sqlite:///%(here)s/devdata.db -sqlalchemy.echo = true -sqlalchemy.echo_pool = false -sqlalchemy.pool_recycle = 3600 - -# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* -# Debug mode will enable the interactive debugging tool, allowing ANYONE to -# execute malicious code after an exception is raised. -#set debug = false - -# Logging configuration -# Add additional loggers, handlers, formatters here -# Uses python's logging config file format -# http://docs.python.org/lib/logging-config-fileformat.html - -[loggers] -keys = root, moksha, sqlalchemy, tg, auth, pylons - -[handlers] -keys = console - -[formatters] -keys = generic - -# If you create additional loggers, add them as a key to [loggers] -[logger_root] -level = INFO -handlers = console - -[logger_moksha] -level = DEBUG -handlers = -qualname = moksha - -[logger_tg] -level = INFO -handlers = -qualname = tg - -# repoze.who is noisy by default -[logger_auth] -level = WARNING -handlers = -qualname = auth - - -[logger_pylons] -level = INFO -handlers = -qualname = pylons - -[logger_sqlalchemy] -level = INFO -handlers = -qualname = sqlalchemy.engine -# "level = INFO" logs SQL queries. -# "level = DEBUG" logs SQL queries and results. -# "level = WARN" logs neither. (Recommended for production systems.) - -# If you create additional handlers, add them as a key to [handlers] -[handler_console] -class = StreamHandler -args = (sys.stderr,) -level = NOTSET -formatter = generic - -# If you create additional formatters, add them as a key to [formatters] -[formatter_generic] -format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s -datefmt = %H:%M:%S diff --git a/sample-production.ini b/sample-production.ini new file mode 100644 index 0000000..b287a2d --- /dev/null +++ b/sample-production.ini @@ -0,0 +1,176 @@ +# +# moksha - Pylons development environment configuration +# +# The %(here)s variable will be replaced with the parent directory of this file +# +# This file is for deployment specific config options -- other configuration +# that is always required for the app is done in the config directory, +# and generally should not be modified by end users. + +[DEFAULT] +debug = false +# Uncomment and replace with the address which should receive any error reports +#email_to = you@yourdomain.com +smtp_server = localhost +error_email_from = paste@localhost + +## +## Moksha-specific configuration options +## + +# Where to store the feed caches. +feed_cache = postgres://moksha:m0ksh4@localhost/moksha_feeds + +# +# Feed Streamer settings +# + +# Max age (in seconds) of each feed in the cache +feed.max_age = 900 + +# Timeout in seconds for the web request +feed.timeout = 30 + +# The number of simultaneous connections +feed.deferred_groups = 10 + +# Where to initialize and store our application databases. %s is the app name. +app_db = sqlite:///%s.db + +# The location of our Orbited server +orbited_host = localhost +orbited_port = 9000 + +# Stomp broker configuration. +stomp_broker = localhost +stomp_port = 61613 +stomp_user = guest +stomp_pass = guest + +# Optional AMQP Broker. +#amqp_broker = guest/guest@localhost + +# Documentation directory +docs_dir = /srv/moksha/docs + +# Moksha chat configuration + +# Use a built-in IRC server +#chat.backend = irc://localhost:9999 +#chat.builtin = true +chat.backend = irc://irc.freenode.net:6667 +chat.rooms = default +chat.default.staticRoomName = moksha +chat.default.roomAssignmentMode = static +chat.default.display.greeting = Moksha Chat +#chat.default.display.floating = true +#chat.default.display.floatingToggle = false +#chat.default.display.width = 400 +#chat.default.display.height = 300 +#chat.default.display.theme = simple +#chat.default.display.resizable = true + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 8080 + +[app:main] +use = egg:moksha +full_stack = true +#lang = ru +cache_dir = %(here)s/data +beaker.session.key = moksha +beaker.session.secret = somesecret + +beaker.cache.type = ext:memcached +beaker.cache.url = localhost:11211 + +# If you'd like to fine-tune the individual locations of the cache data dirs +# for the Cache data, or the Session saves, un-comment the desired settings +# here: +#beaker.cache.data_dir = %(here)s/data/cache +#beaker.session.data_dir = %(here)s/data/sessions + + + +# pick the form for your database +# %(here) may include a ':' character on Windows environments; this can +# invalidate the URI when specifying a SQLite db via path name +sqlalchemy.url=postgres://moksha:m0ksh4@localhost/moksha +# sqlalchemy.url=mysql://username:password@hostname:port/databasename + + +# If you have sqlite, here's a simple default to get you started +# in development + +#sqlalchemy.url = sqlite:///%(here)s/devdata.db +sqlalchemy.echo = true +sqlalchemy.echo_pool = false +sqlalchemy.pool_recycle = 3600 + +# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* +# Debug mode will enable the interactive debugging tool, allowing ANYONE to +# execute malicious code after an exception is raised. +#set debug = false + +# Logging configuration +# Add additional loggers, handlers, formatters here +# Uses python's logging config file format +# http://docs.python.org/lib/logging-config-fileformat.html + +[loggers] +keys = root, moksha, sqlalchemy, tg, auth, pylons + +[handlers] +keys = console + +[formatters] +keys = generic + +# If you create additional loggers, add them as a key to [loggers] +[logger_root] +level = INFO +handlers = console + +[logger_moksha] +level = DEBUG +handlers = +qualname = moksha + +[logger_tg] +level = INFO +handlers = +qualname = tg + +# repoze.who is noisy by default +[logger_auth] +level = WARNING +handlers = +qualname = auth + + +[logger_pylons] +level = INFO +handlers = +qualname = pylons + +[logger_sqlalchemy] +level = INFO +handlers = +qualname = sqlalchemy.engine +# "level = INFO" logs SQL queries. +# "level = DEBUG" logs SQL queries and results. +# "level = WARN" logs neither. (Recommended for production systems.) + +# If you create additional handlers, add them as a key to [handlers] +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +# If you create additional formatters, add them as a key to [formatters] +[formatter_generic] +format = %(asctime)s,%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S
commit 1425b605bab5fbead3f7b7dce1f10cb9d225a851 Merge: b26eeed... e433099... Author: Luke Macken lmacken@redhat.com Date: Thu Mar 12 13:34:01 2009 -0400
Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha
commit b26eeedd52f3f86e17d0568ce2638f5ada9e69fd Merge: c4aec5f... 1c88c76... Author: Luke Macken lmacken@redhat.com Date: Wed Mar 11 09:32:36 2009 -0400
Merge branch 'master' of git+ssh://git.fedorahosted.org/git/moksha
commit c4aec5f1d1e09a9ba8548bb8c1902cd71e97fc87 Author: Luke Macken lmacken@redhat.com Date: Tue Mar 10 16:09:43 2009 -0400
Disable caching the index method until we can figure out how to include widget resources from above us in the WSGI stack.
diff --git a/moksha/controllers/root.py b/moksha/controllers/root.py index 1aa4725..115b121 100644 --- a/moksha/controllers/root.py +++ b/moksha/controllers/root.py @@ -55,7 +55,7 @@ class RootController(BaseController): docs_dir=config.get('docs_dir', 'docs'), full_stack=False))
- @after_render(cache_rendered_data) + #@after_render(cache_rendered_data) @expose('mako:moksha.templates.index') def index(self): tmpl_context.menu_widget = moksha.menus['default_menu']
moksha-commits@lists.fedorahosted.org