diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -247,7 +247,6 @@ issue_prefix = # #issue_server_link_wiki = https://mywiki.com/{id} #issue_prefix_wiki = WIKI- - ## instance-id prefix ## a prefix key for this instance used for cache invalidation when running ## multiple instances of kallithea, make sure it's globally unique for @@ -269,7 +268,6 @@ allow_repo_location_change = True ## allows to setup custom hooks in settings page allow_custom_hooks_settings = True - #################################### ### CELERY CONFIG #### #################################### @@ -374,7 +372,6 @@ beaker.session.auto = False ## default cookie expiration time in seconds `true` expire at browser close ## #beaker.session.cookie_expires = 3600 - ############################ ## ERROR HANDLING SYSTEMS ## ############################ @@ -422,7 +419,6 @@ errormator.logging_on_error = false ## start with HTTP* this list be extended with additional keywords here errormator.environ_keys_whitelist = - ## list of keywords that should be blanked from request object ## can be string with comma separated list of words in lowercase ## (by default client will always blank keys that contain following words @@ -430,13 +426,11 @@ errormator.environ_keys_whitelist = ## this list be extended with additional keywords set here errormator.request_keys_blacklist = - ## list of namespaces that should be ignores when gathering log entries ## can be string with comma separated list of namespaces ## (by default the client ignores own entries: errormator_client.client) errormator.log_namespace_blacklist = - ################ ### [sentry] ### ################ @@ -455,7 +449,6 @@ sentry.site = sentry.include_paths = sentry.exclude_paths = - ################################################################################ ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## ## Debug mode will enable the interactive debugging tool, allowing ANYONE to ## diff --git a/kallithea/bin/template.ini.mako b/kallithea/bin/template.ini.mako --- a/kallithea/bin/template.ini.mako +++ b/kallithea/bin/template.ini.mako @@ -1,19 +1,19 @@ ## -*- coding: utf-8 -*- -<%text>################################################################################ -################################################################################ +<%text>################################################################################ +<%text>################################################################################ # Kallithea - config file generated with kallithea-config # -################################################################################ -################################################################################ - +<%text>################################################################################ +<%text>################################################################################ + [DEFAULT] debug = true pdebug = false -<%text> -################################################################################ -## Uncomment and replace with the address which should receive ## -## any error reports after application crash ## -## Additionally those settings will be used by Kallithea mailing system ## -################################################################################ + +<%text>################################################################################ +<%text>## Uncomment and replace with the address which should receive ## +<%text>## any error reports after application crash ## +<%text>## Additionally those settings will be used by Kallithea mailing system ## +<%text>################################################################################ #email_to = admin@localhost #error_email_from = paste_error@localhost #app_email_from = kallithea-noreply@localhost @@ -244,7 +244,6 @@ issue_prefix = # #issue_server_link_wiki = https://mywiki.com/{id} #issue_prefix_wiki = WIKI- - <%text>## instance-id prefix <%text>## a prefix key for this instance used for cache invalidation when running <%text>## multiple instances of kallithea, make sure it's globally unique for @@ -266,11 +265,10 @@ allow_repo_location_change = True <%text>## allows to setup custom hooks in settings page allow_custom_hooks_settings = True -<%text> -#################################### -### CELERY CONFIG #### -#################################### - +<%text>#################################### +<%text>### CELERY CONFIG #### +<%text>#################################### + use_celery = false broker.host = localhost broker.vhost = rabbitmqhost @@ -294,11 +292,11 @@ celeryd.max.tasks.per.child = 1 <%text>## tasks will never be sent to the queue, but executed locally instead. celery.always.eager = false -<%text> -#################################### -### BEAKER CACHE #### -#################################### - + +<%text>#################################### +<%text>### BEAKER CACHE #### +<%text>#################################### + beaker.cache.data_dir=${here}/data/cache/data beaker.cache.lock_dir=${here}/data/cache/lock @@ -327,15 +325,15 @@ beaker.cache.sql_cache_med.key_length = beaker.cache.sql_cache_long.type=file beaker.cache.sql_cache_long.expire=3600 beaker.cache.sql_cache_long.key_length = 256 -<%text> -#################################### -### BEAKER SESSION #### -#################################### -## Type of storage used for the session, current types are -## dbm, file, memcached, database, and memory. -## The storage uses the Container API -## that is also used by the cache system. - + +<%text>#################################### +<%text>### BEAKER SESSION #### +<%text>#################################### +<%text>## Type of storage used for the session, current types are +<%text>## dbm, file, memcached, database, and memory. +<%text>## The storage uses the Container API +<%text>## that is also used by the cache system. + <%text>## db session ## #beaker.session.type = ext:database #beaker.session.sa.url = postgresql://postgres:qwe@localhost/kallithea @@ -347,10 +345,8 @@ beaker.cache.sql_cache_long.key_length = <%text>## file based cookies (default) ## #beaker.session.type = file -<%text> -## beaker.session.key should be unique for a given host, even when running -## on different ports. Otherwise, cookie sessions will be shared and messed up. - +<%text>## beaker.session.key should be unique for a given host, even when running +<%text>## on different ports. Otherwise, cookie sessions will be shared and messed up. beaker.session.key = kallithea beaker.session.secret = ${uuid()} @@ -374,19 +370,19 @@ beaker.session.auto = False #beaker.session.cookie_expires = 3600 %if error_aggregation_service == 'errormator': -<%text> -############################ -## ERROR HANDLING SYSTEMS ## -############################ + +<%text>############################ +<%text>## ERROR HANDLING SYSTEMS ## +<%text>############################ -#################### -### [errormator] ### -#################### +<%text>#################### +<%text>### [errormator] ### +<%text>#################### -## Errormator is tailored to work with Kallithea, see -## http://errormator.com for details how to obtain an account -## you must install python package `errormator_client` to make it work - +<%text>## Errormator is tailored to work with Kallithea, see +<%text>## http://errormator.com for details how to obtain an account +<%text>## you must install python package `errormator_client` to make it work + <%text>## errormator enabled errormator = false @@ -422,7 +418,6 @@ errormator.logging_on_error = false <%text>## start with HTTP* this list be extended with additional keywords here errormator.environ_keys_whitelist = - <%text>## list of keywords that should be blanked from request object <%text>## can be string with comma separated list of words in lowercase <%text>## (by default client will always blank keys that contain following words @@ -430,20 +425,19 @@ errormator.environ_keys_whitelist = <%text>## this list be extended with additional keywords set here errormator.request_keys_blacklist = - <%text>## list of namespaces that should be ignores when gathering log entries <%text>## can be string with comma separated list of namespaces <%text>## (by default the client ignores own entries: errormator_client.client) errormator.log_namespace_blacklist = %elif error_aggregation_service == 'sentry': -<%text> -################ -### [sentry] ### -################ -## sentry is a alternative open source error aggregator -## you must install python packages `sentry` and `raven` to enable - +<%text>################ +<%text>### [sentry] ### +<%text>################ + +<%text>## sentry is a alternative open source error aggregator +<%text>## you must install python packages `sentry` and `raven` to enable + sentry.dsn = YOUR_DNS sentry.servers = sentry.name = @@ -455,26 +449,26 @@ sentry.site = sentry.include_paths = sentry.exclude_paths = %endif -<%text> -################################################################################ -## 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. ## -################################################################################ + +<%text>################################################################################ +<%text>## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## +<%text>## Debug mode will enable the interactive debugging tool, allowing ANYONE to ## +<%text>## execute malicious code after an exception is raised. ## +<%text>################################################################################ set debug = false -<%text> -################################## -### LOGVIEW CONFIG ### -################################## - + +<%text>################################## +<%text>### LOGVIEW CONFIG ### +<%text>################################## + logview.sqlalchemy = #faa logview.pylons.templating = #bfb logview.pylons.util = #eee -<%text> -######################################################### -### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### -######################################################### - + +<%text>######################################################### +<%text>### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG ### +<%text>######################################################### + %if database_engine == 'sqlite': # SQLITE [default] sqlalchemy.db1.url = sqlite:///${here}/kallithea.db?timeout=60 @@ -490,11 +484,11 @@ sqlalchemy.db1.url = mysql://user:pass@l sqlalchemy.db1.echo = false sqlalchemy.db1.pool_recycle = 3600 sqlalchemy.db1.convert_unicode = true -<%text> -################################ -### LOGGING CONFIGURATION #### -################################ - + +<%text>################################ +<%text>### LOGGING CONFIGURATION #### +<%text>################################ + [loggers] keys = root, routes, kallithea, sqlalchemy, beaker, templates, whoosh_indexer @@ -503,11 +497,11 @@ keys = console, console_sql [formatters] keys = generic, color_formatter, color_formatter_sql -<%text> -############# -## LOGGERS ## -############# - + +<%text>############# +<%text>## LOGGERS ## +<%text>############# + [logger_root] level = NOTSET handlers = console @@ -548,11 +542,11 @@ level = DEBUG handlers = qualname = whoosh_indexer propagate = 1 -<%text> -############## -## HANDLERS ## -############## - + +<%text>############## +<%text>## HANDLERS ## +<%text>############## + [handler_console] class = StreamHandler args = (sys.stderr,) @@ -564,11 +558,11 @@ class = StreamHandler args = (sys.stderr,) level = WARN formatter = generic -<%text> -################ -## FORMATTERS ## -################ - + +<%text>################ +<%text>## FORMATTERS ## +<%text>################ + [formatter_generic] format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s datefmt = %Y-%m-%d %H:%M:%S diff --git a/kallithea/config/deployment.ini_tmpl b/kallithea/config/deployment.ini_tmpl --- a/kallithea/config/deployment.ini_tmpl +++ b/kallithea/config/deployment.ini_tmpl @@ -241,7 +241,6 @@ issue_prefix = # #issue_server_link_wiki = https://mywiki.com/{id} #issue_prefix_wiki = WIKI- - ## instance-id prefix ## a prefix key for this instance used for cache invalidation when running ## multiple instances of kallithea, make sure it's globally unique for @@ -263,7 +262,6 @@ allow_repo_location_change = True ## allows to setup custom hooks in settings page allow_custom_hooks_settings = True - #################################### ### CELERY CONFIG #### #################################### @@ -368,7 +366,6 @@ beaker.session.auto = False ## default cookie expiration time in seconds `true` expire at browser close ## #beaker.session.cookie_expires = 3600 - ############################ ## ERROR HANDLING SYSTEMS ## ############################ @@ -416,7 +413,6 @@ errormator.logging_on_error = false ## start with HTTP* this list be extended with additional keywords here errormator.environ_keys_whitelist = - ## list of keywords that should be blanked from request object ## can be string with comma separated list of words in lowercase ## (by default client will always blank keys that contain following words @@ -424,13 +420,11 @@ errormator.environ_keys_whitelist = ## this list be extended with additional keywords set here errormator.request_keys_blacklist = - ## list of namespaces that should be ignores when gathering log entries ## can be string with comma separated list of namespaces ## (by default the client ignores own entries: errormator_client.client) errormator.log_namespace_blacklist = - ################ ### [sentry] ### ################ @@ -449,7 +443,6 @@ sentry.site = sentry.include_paths = sentry.exclude_paths = - ################################################################################ ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## ## Debug mode will enable the interactive debugging tool, allowing ANYONE to ## diff --git a/test.ini b/test.ini --- a/test.ini +++ b/test.ini @@ -247,7 +247,6 @@ issue_prefix = # #issue_server_link_wiki = https://mywiki.com/{id} #issue_prefix_wiki = WIKI- - ## instance-id prefix ## a prefix key for this instance used for cache invalidation when running ## multiple instances of kallithea, make sure it's globally unique for @@ -269,7 +268,6 @@ allow_repo_location_change = True ## allows to setup custom hooks in settings page allow_custom_hooks_settings = True - #################################### ### CELERY CONFIG #### #################################### @@ -374,7 +372,6 @@ beaker.session.auto = False ## default cookie expiration time in seconds `true` expire at browser close ## #beaker.session.cookie_expires = 3600 - ############################ ## ERROR HANDLING SYSTEMS ## ############################ @@ -422,7 +419,6 @@ errormator.logging_on_error = false ## start with HTTP* this list be extended with additional keywords here errormator.environ_keys_whitelist = - ## list of keywords that should be blanked from request object ## can be string with comma separated list of words in lowercase ## (by default client will always blank keys that contain following words @@ -430,13 +426,11 @@ errormator.environ_keys_whitelist = ## this list be extended with additional keywords set here errormator.request_keys_blacklist = - ## list of namespaces that should be ignores when gathering log entries ## can be string with comma separated list of namespaces ## (by default the client ignores own entries: errormator_client.client) errormator.log_namespace_blacklist = - ################ ### [sentry] ### ################ @@ -455,7 +449,6 @@ sentry.site = sentry.include_paths = sentry.exclude_paths = - ################################################################################ ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT* ## ## Debug mode will enable the interactive debugging tool, allowing ANYONE to ##