##// END OF EJS Templates
Implemented show_id function that is a configurable way to display sha hashes in the changelog.
marcink -
r3557:58dcef7e beta
parent child Browse files
Show More
@@ -25,69 +25,88 b' pdebug = false'
25 25 #smtp_port =
26 26 #smtp_use_tls = false
27 27 #smtp_use_ssl = true
28 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
28 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
29 29 #smtp_auth =
30 30
31 31 [server:main]
32 32 ## PASTE
33 ##nr of threads to spawn
33 ## nr of threads to spawn
34 34 #threadpool_workers = 5
35 35
36 ##max request before thread respawn
36 ## max request before thread respawn
37 37 #threadpool_max_requests = 10
38 38
39 ##option to use threads of process
39 ## option to use threads of process
40 40 #use_threadpool = true
41 41
42 42 #use = egg:Paste#http
43 43
44 #WAITRESS
44 ## WAITRESS
45 45 threads = 5
46 #100GB
46 ## 100GB
47 47 max_request_body_size = 107374182400
48 48 use = egg:waitress#main
49 49
50 50 host = 0.0.0.0
51 51 port = 5000
52 52
53 [filter:proxy-prefix]
54 # prefix middleware for rc
55 use = egg:PasteDeploy#prefix
56 prefix = /<your-prefix>
53 ## prefix middleware for rc
54 #[filter:proxy-prefix]
55 #use = egg:PasteDeploy#prefix
56 #prefix = /<your-prefix>
57 57
58 58 [app:main]
59 59 use = egg:rhodecode
60 ## enable proxy prefix middleware
60 61 #filter-with = proxy-prefix
62
61 63 full_stack = true
62 64 static_files = true
63 # Optional Languages
64 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 ## Optional Languages
66 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 67 lang = en
66 68 cache_dir = %(here)s/data
67 69 index_dir = %(here)s/data/index
68 # set this path to use archive download cache
69 #archive_cache_dir = /tmp/rhodecode_tarballcache
70 app_instance_uuid = rc-develop
70
71 ## uncomment and set this path to use archive download cache
72 #archive_cache_dir = /tmp/tarballcache
73
74 ## change this to unique ID for security
75 app_instance_uuid = rc-production
76
77 ## cut off limit for large diffs (size in bytes)
71 78 cut_off_limit = 256000
72 vcs_full_cache = True
73 # force https in RhodeCode, fixes https redirects, assumes it's always https
79
80 ## use cache version of scm repo everywhere
81 vcs_full_cache = true
82
83 ## force https in RhodeCode, fixes https redirects, assumes it's always https
74 84 force_https = false
75 # use Strict-Transport-Security headers
85
86 ## use Strict-Transport-Security headers
76 87 use_htsts = false
88
89 ## number of commits stats will parse on each iteration
77 90 commit_parse_limit = 25
78 # number of items displayed in lightweight dashboard before paginating
91
92 ## number of items displayed in lightweight dashboard before paginating is shown
79 93 dashboard_items = 100
94
95 ## use gravatar service to display avatars
80 96 use_gravatar = true
81 97
82 # path to git executable
98 ## path to git executable
83 99 git_path = git
84 100
85 101 ## RSS feed options
86
87 102 rss_cut_off_limit = 256000
88 103 rss_items_per_page = 10
89 104 rss_include_diff = false
90 105
106 ## show hash options for changelog
107 sha_len = 12
108 sha_rev = true
109
91 110
92 111 ## alternative_gravatar_url allows you to use your own avatar server application
93 112 ## the following parts of the URL will be replaced
@@ -99,8 +118,11 b' rss_include_diff = false'
99 118 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
100 119 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
101 120
121
122 ## container auth options
102 123 container_auth_enabled = false
103 124 proxypass_auth_enabled = false
125
104 126 ## default encoding used to convert from and to unicode
105 127 ## can be also a comma seperated list of encoding in case of mixed encodings
106 128 default_encoding = utf8
@@ -185,7 +207,7 b' celeryd.concurrency = 2'
185 207 celeryd.log.level = debug
186 208 celeryd.max.tasks.per.child = 1
187 209
188 #tasks will never be sent to the queue, but executed locally instead.
210 ## tasks will never be sent to the queue, but executed locally instead.
189 211 celery.always.eager = false
190 212
191 213 ####################################
@@ -241,18 +263,19 b' beaker.cache.sql_cache_long.key_length ='
241 263
242 264
243 265 beaker.session.key = rhodecode
244 ## secure cookie requires AES python libraries ##
245 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
246 #beaker.session.validate_key = 9712sds2212c--zxc123
266 ## secure cookie requires AES python libraries
267 #beaker.session.encrypt_key = <key_for_encryption>
268 #beaker.session.validate_key = <validation_key>
269
247 270 ## sets session as invalid if it haven't been accessed for given amount of time
248 271 beaker.session.timeout = 2592000
249 272 beaker.session.httponly = true
250 273 #beaker.session.cookie_path = /<your-prefix>
251 274
252 ## uncomment for https secure cookie ##
275 ## uncomment for https secure cookie
253 276 beaker.session.secure = false
254 277
255 ## auto save the session to not to use .save() ##
278 ## auto save the session to not to use .save()
256 279 beaker.session.auto = False
257 280
258 281 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -267,57 +290,57 b' beaker.session.auto = False'
267 290 ### [errormator] ###
268 291 ####################
269 292
270 # Errormator is tailored to work with RhodeCode, see
271 # http://errormator.com for details how to obtain an account
272 # you must install python package `errormator_client` to make it work
293 ## Errormator is tailored to work with RhodeCode, see
294 ## http://errormator.com for details how to obtain an account
295 ## you must install python package `errormator_client` to make it work
273 296
274 # errormator enabled
275 errormator = true
297 ## errormator enabled
298 errormator = false
276 299
277 300 errormator.server_url = https://api.errormator.com
278 301 errormator.api_key = YOUR_API_KEY
279 302
280 # TWEAK AMOUNT OF INFO SENT HERE
303 ## TWEAK AMOUNT OF INFO SENT HERE
281 304
282 # enables 404 error logging (default False)
305 ## enables 404 error logging (default False)
283 306 errormator.report_404 = false
284 307
285 # time in seconds after request is considered being slow (default 1)
308 ## time in seconds after request is considered being slow (default 1)
286 309 errormator.slow_request_time = 1
287 310
288 # record slow requests in application
289 # (needs to be enabled for slow datastore recording and time tracking)
311 ## record slow requests in application
312 ## (needs to be enabled for slow datastore recording and time tracking)
290 313 errormator.slow_requests = true
291 314
292 # enable hooking to application loggers
315 ## enable hooking to application loggers
293 316 # errormator.logging = true
294 317
295 # minimum log level for log capture
318 ## minimum log level for log capture
296 319 # errormator.logging.level = WARNING
297 320
298 # send logs only from erroneous/slow requests
299 # (saves API quota for intensive logging)
321 ## send logs only from erroneous/slow requests
322 ## (saves API quota for intensive logging)
300 323 errormator.logging_on_error = false
301 324
302 # list of additonal keywords that should be grabbed from environ object
303 # can be string with comma separated list of words in lowercase
304 # (by default client will always send following info:
305 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
306 # start with HTTP* this list be extended with additional keywords here
325 ## list of additonal keywords that should be grabbed from environ object
326 ## can be string with comma separated list of words in lowercase
327 ## (by default client will always send following info:
328 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
329 ## start with HTTP* this list be extended with additional keywords here
307 330 errormator.environ_keys_whitelist =
308 331
309 332
310 # list of keywords that should be blanked from request object
311 # can be string with comma separated list of words in lowercase
312 # (by default client will always blank keys that contain following words
313 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
314 # this list be extended with additional keywords set here
333 ## list of keywords that should be blanked from request object
334 ## can be string with comma separated list of words in lowercase
335 ## (by default client will always blank keys that contain following words
336 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
337 ## this list be extended with additional keywords set here
315 338 errormator.request_keys_blacklist =
316 339
317 340
318 # list of namespaces that should be ignores when gathering log entries
319 # can be string with comma separated list of namespaces
320 # (by default the client ignores own entries: errormator_client.client)
341 ## list of namespaces that should be ignores when gathering log entries
342 ## can be string with comma separated list of namespaces
343 ## (by default the client ignores own entries: errormator_client.client)
321 344 errormator.log_namespace_blacklist =
322 345
323 346
@@ -325,8 +348,8 b' errormator.log_namespace_blacklist ='
325 348 ### [sentry] ###
326 349 ################
327 350
328 # sentry is a alternative open source error aggregator
329 # you must install python packages `sentry` and `raven` to enable
351 ## sentry is a alternative open source error aggregator
352 ## you must install python packages `sentry` and `raven` to enable
330 353
331 354 sentry.dsn = YOUR_DNS
332 355 sentry.servers =
@@ -386,7 +409,7 b' handlers = console'
386 409 level = DEBUG
387 410 handlers =
388 411 qualname = routes.middleware
389 # "level = DEBUG" logs the route matched and routing variables.
412 ## "level = DEBUG" logs the route matched and routing variables.
390 413 propagate = 1
391 414
392 415 [logger_beaker]
@@ -25,69 +25,88 b' pdebug = false'
25 25 #smtp_port =
26 26 #smtp_use_tls = false
27 27 #smtp_use_ssl = true
28 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
28 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
29 29 #smtp_auth =
30 30
31 31 [server:main]
32 32 ## PASTE
33 ##nr of threads to spawn
33 ## nr of threads to spawn
34 34 #threadpool_workers = 5
35 35
36 ##max request before thread respawn
36 ## max request before thread respawn
37 37 #threadpool_max_requests = 10
38 38
39 ##option to use threads of process
39 ## option to use threads of process
40 40 #use_threadpool = true
41 41
42 42 #use = egg:Paste#http
43 43
44 #WAITRESS
44 ## WAITRESS
45 45 threads = 5
46 #100GB
46 ## 100GB
47 47 max_request_body_size = 107374182400
48 48 use = egg:waitress#main
49 49
50 50 host = 127.0.0.1
51 51 port = 8001
52 52
53 [filter:proxy-prefix]
54 # prefix middleware for rc
55 use = egg:PasteDeploy#prefix
56 prefix = /<your-prefix>
53 ## prefix middleware for rc
54 #[filter:proxy-prefix]
55 #use = egg:PasteDeploy#prefix
56 #prefix = /<your-prefix>
57 57
58 58 [app:main]
59 59 use = egg:rhodecode
60 ## enable proxy prefix middleware
60 61 #filter-with = proxy-prefix
62
61 63 full_stack = true
62 64 static_files = true
63 # Optional Languages
64 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 ## Optional Languages
66 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 67 lang = en
66 68 cache_dir = %(here)s/data
67 69 index_dir = %(here)s/data/index
68 # set this path to use archive download cache
69 #archive_cache_dir = /tmp/rhodecode_tarballcache
70
71 ## uncomment and set this path to use archive download cache
72 #archive_cache_dir = /tmp/tarballcache
73
74 ## change this to unique ID for security
70 75 app_instance_uuid = rc-production
76
77 ## cut off limit for large diffs (size in bytes)
71 78 cut_off_limit = 256000
72 vcs_full_cache = True
73 # force https in RhodeCode, fixes https redirects, assumes it's always https
79
80 ## use cache version of scm repo everywhere
81 vcs_full_cache = true
82
83 ## force https in RhodeCode, fixes https redirects, assumes it's always https
74 84 force_https = false
75 # use Strict-Transport-Security headers
85
86 ## use Strict-Transport-Security headers
76 87 use_htsts = false
77 commit_parse_limit = 50
78 # number of items displayed in lightweight dashboard before paginating
88
89 ## number of commits stats will parse on each iteration
90 commit_parse_limit = 25
91
92 ## number of items displayed in lightweight dashboard before paginating is shown
79 93 dashboard_items = 100
94
95 ## use gravatar service to display avatars
80 96 use_gravatar = true
81 97
82 # path to git executable
98 ## path to git executable
83 99 git_path = git
84 100
85 101 ## RSS feed options
86
87 102 rss_cut_off_limit = 256000
88 103 rss_items_per_page = 10
89 104 rss_include_diff = false
90 105
106 ## show hash options for changelog
107 sha_len = 12
108 sha_rev = true
109
91 110
92 111 ## alternative_gravatar_url allows you to use your own avatar server application
93 112 ## the following parts of the URL will be replaced
@@ -99,8 +118,11 b' rss_include_diff = false'
99 118 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
100 119 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
101 120
121
122 ## container auth options
102 123 container_auth_enabled = false
103 124 proxypass_auth_enabled = false
125
104 126 ## default encoding used to convert from and to unicode
105 127 ## can be also a comma seperated list of encoding in case of mixed encodings
106 128 default_encoding = utf8
@@ -185,7 +207,7 b' celeryd.concurrency = 2'
185 207 celeryd.log.level = debug
186 208 celeryd.max.tasks.per.child = 1
187 209
188 #tasks will never be sent to the queue, but executed locally instead.
210 ## tasks will never be sent to the queue, but executed locally instead.
189 211 celery.always.eager = false
190 212
191 213 ####################################
@@ -241,18 +263,19 b' beaker.cache.sql_cache_long.key_length ='
241 263
242 264
243 265 beaker.session.key = rhodecode
244 ## secure cookie requires AES python libraries ##
245 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
246 #beaker.session.validate_key = 9712sds2212c--zxc123
266 ## secure cookie requires AES python libraries
267 #beaker.session.encrypt_key = <key_for_encryption>
268 #beaker.session.validate_key = <validation_key>
269
247 270 ## sets session as invalid if it haven't been accessed for given amount of time
248 271 beaker.session.timeout = 2592000
249 272 beaker.session.httponly = true
250 273 #beaker.session.cookie_path = /<your-prefix>
251 274
252 ## uncomment for https secure cookie ##
275 ## uncomment for https secure cookie
253 276 beaker.session.secure = false
254 277
255 ## auto save the session to not to use .save() ##
278 ## auto save the session to not to use .save()
256 279 beaker.session.auto = False
257 280
258 281 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -267,57 +290,57 b' beaker.session.auto = False'
267 290 ### [errormator] ###
268 291 ####################
269 292
270 # Errormator is tailored to work with RhodeCode, see
271 # http://errormator.com for details how to obtain an account
272 # you must install python package `errormator_client` to make it work
293 ## Errormator is tailored to work with RhodeCode, see
294 ## http://errormator.com for details how to obtain an account
295 ## you must install python package `errormator_client` to make it work
273 296
274 # errormator enabled
275 errormator = true
297 ## errormator enabled
298 errormator = false
276 299
277 300 errormator.server_url = https://api.errormator.com
278 301 errormator.api_key = YOUR_API_KEY
279 302
280 # TWEAK AMOUNT OF INFO SENT HERE
303 ## TWEAK AMOUNT OF INFO SENT HERE
281 304
282 # enables 404 error logging (default False)
305 ## enables 404 error logging (default False)
283 306 errormator.report_404 = false
284 307
285 # time in seconds after request is considered being slow (default 1)
308 ## time in seconds after request is considered being slow (default 1)
286 309 errormator.slow_request_time = 1
287 310
288 # record slow requests in application
289 # (needs to be enabled for slow datastore recording and time tracking)
311 ## record slow requests in application
312 ## (needs to be enabled for slow datastore recording and time tracking)
290 313 errormator.slow_requests = true
291 314
292 # enable hooking to application loggers
315 ## enable hooking to application loggers
293 316 # errormator.logging = true
294 317
295 # minimum log level for log capture
318 ## minimum log level for log capture
296 319 # errormator.logging.level = WARNING
297 320
298 # send logs only from erroneous/slow requests
299 # (saves API quota for intensive logging)
321 ## send logs only from erroneous/slow requests
322 ## (saves API quota for intensive logging)
300 323 errormator.logging_on_error = false
301 324
302 # list of additonal keywords that should be grabbed from environ object
303 # can be string with comma separated list of words in lowercase
304 # (by default client will always send following info:
305 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
306 # start with HTTP* this list be extended with additional keywords here
325 ## list of additonal keywords that should be grabbed from environ object
326 ## can be string with comma separated list of words in lowercase
327 ## (by default client will always send following info:
328 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
329 ## start with HTTP* this list be extended with additional keywords here
307 330 errormator.environ_keys_whitelist =
308 331
309 332
310 # list of keywords that should be blanked from request object
311 # can be string with comma separated list of words in lowercase
312 # (by default client will always blank keys that contain following words
313 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
314 # this list be extended with additional keywords set here
333 ## list of keywords that should be blanked from request object
334 ## can be string with comma separated list of words in lowercase
335 ## (by default client will always blank keys that contain following words
336 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
337 ## this list be extended with additional keywords set here
315 338 errormator.request_keys_blacklist =
316 339
317 340
318 # list of namespaces that should be ignores when gathering log entries
319 # can be string with comma separated list of namespaces
320 # (by default the client ignores own entries: errormator_client.client)
341 ## list of namespaces that should be ignores when gathering log entries
342 ## can be string with comma separated list of namespaces
343 ## (by default the client ignores own entries: errormator_client.client)
321 344 errormator.log_namespace_blacklist =
322 345
323 346
@@ -325,8 +348,8 b' errormator.log_namespace_blacklist ='
325 348 ### [sentry] ###
326 349 ################
327 350
328 # sentry is a alternative open source error aggregator
329 # you must install python packages `sentry` and `raven` to enable
351 ## sentry is a alternative open source error aggregator
352 ## you must install python packages `sentry` and `raven` to enable
330 353
331 354 sentry.dsn = YOUR_DNS
332 355 sentry.servers =
@@ -386,7 +409,7 b' handlers = console'
386 409 level = DEBUG
387 410 handlers =
388 411 qualname = routes.middleware
389 # "level = DEBUG" logs the route matched and routing variables.
412 ## "level = DEBUG" logs the route matched and routing variables.
390 413 propagate = 1
391 414
392 415 [logger_beaker]
@@ -25,69 +25,88 b' pdebug = false'
25 25 #smtp_port =
26 26 #smtp_use_tls = false
27 27 #smtp_use_ssl = true
28 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
28 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
29 29 #smtp_auth =
30 30
31 31 [server:main]
32 32 ## PASTE
33 ##nr of threads to spawn
33 ## nr of threads to spawn
34 34 #threadpool_workers = 5
35 35
36 ##max request before thread respawn
36 ## max request before thread respawn
37 37 #threadpool_max_requests = 10
38 38
39 ##option to use threads of process
39 ## option to use threads of process
40 40 #use_threadpool = true
41 41
42 42 #use = egg:Paste#http
43 43
44 #WAITRESS
44 ## WAITRESS
45 45 threads = 5
46 #100GB
46 ## 100GB
47 47 max_request_body_size = 107374182400
48 48 use = egg:waitress#main
49 49
50 50 host = 127.0.0.1
51 51 port = 5000
52 52
53 [filter:proxy-prefix]
54 # prefix middleware for rc
55 use = egg:PasteDeploy#prefix
56 prefix = /<your-prefix>
53 ## prefix middleware for rc
54 #[filter:proxy-prefix]
55 #use = egg:PasteDeploy#prefix
56 #prefix = /<your-prefix>
57 57
58 58 [app:main]
59 59 use = egg:rhodecode
60 ## enable proxy prefix middleware
60 61 #filter-with = proxy-prefix
62
61 63 full_stack = true
62 64 static_files = true
63 # Optional Languages
64 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 ## Optional Languages
66 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 67 lang = en
66 68 cache_dir = %(here)s/data
67 69 index_dir = %(here)s/data/index
68 # set this path to use archive download cache
69 #archive_cache_dir = /tmp/rhodecode_tarballcache
70
71 ## uncomment and set this path to use archive download cache
72 #archive_cache_dir = /tmp/tarballcache
73
74 ## change this to unique ID for security
70 75 app_instance_uuid = ${app_instance_uuid}
76
77 ## cut off limit for large diffs (size in bytes)
71 78 cut_off_limit = 256000
72 vcs_full_cache = True
73 # force https in RhodeCode, fixes https redirects, assumes it's always https
79
80 ## use cache version of scm repo everywhere
81 vcs_full_cache = true
82
83 ## force https in RhodeCode, fixes https redirects, assumes it's always https
74 84 force_https = false
75 # use Strict-Transport-Security headers
85
86 ## use Strict-Transport-Security headers
76 87 use_htsts = false
77 commit_parse_limit = 50
78 # number of items displayed in lightweight dashboard before paginating
88
89 ## number of commits stats will parse on each iteration
90 commit_parse_limit = 25
91
92 ## number of items displayed in lightweight dashboard before paginating is shown
79 93 dashboard_items = 100
94
95 ## use gravatar service to display avatars
80 96 use_gravatar = true
81 97
82 # path to git executable
98 ## path to git executable
83 99 git_path = git
84 100
85 101 ## RSS feed options
86
87 102 rss_cut_off_limit = 256000
88 103 rss_items_per_page = 10
89 104 rss_include_diff = false
90 105
106 ## show hash options for changelog
107 sha_len = 12
108 sha_rev = true
109
91 110
92 111 ## alternative_gravatar_url allows you to use your own avatar server application
93 112 ## the following parts of the URL will be replaced
@@ -99,8 +118,11 b' rss_include_diff = false'
99 118 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
100 119 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
101 120
121
122 ## container auth options
102 123 container_auth_enabled = false
103 124 proxypass_auth_enabled = false
125
104 126 ## default encoding used to convert from and to unicode
105 127 ## can be also a comma seperated list of encoding in case of mixed encodings
106 128 default_encoding = utf8
@@ -185,7 +207,7 b' celeryd.concurrency = 2'
185 207 celeryd.log.level = debug
186 208 celeryd.max.tasks.per.child = 1
187 209
188 #tasks will never be sent to the queue, but executed locally instead.
210 ## tasks will never be sent to the queue, but executed locally instead.
189 211 celery.always.eager = false
190 212
191 213 ####################################
@@ -241,18 +263,19 b' beaker.cache.sql_cache_long.key_length ='
241 263
242 264
243 265 beaker.session.key = rhodecode
244 ## secure cookie requires AES python libraries ##
245 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
246 #beaker.session.validate_key = 9712sds2212c--zxc123
266 ## secure cookie requires AES python libraries
267 #beaker.session.encrypt_key = <key_for_encryption>
268 #beaker.session.validate_key = <validation_key>
269
247 270 ## sets session as invalid if it haven't been accessed for given amount of time
248 271 beaker.session.timeout = 2592000
249 272 beaker.session.httponly = true
250 273 #beaker.session.cookie_path = /<your-prefix>
251 274
252 ## uncomment for https secure cookie ##
275 ## uncomment for https secure cookie
253 276 beaker.session.secure = false
254 277
255 ## auto save the session to not to use .save() ##
278 ## auto save the session to not to use .save()
256 279 beaker.session.auto = False
257 280
258 281 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -267,57 +290,57 b' beaker.session.auto = False'
267 290 ### [errormator] ###
268 291 ####################
269 292
270 # Errormator is tailored to work with RhodeCode, see
271 # http://errormator.com for details how to obtain an account
272 # you must install python package `errormator_client` to make it work
293 ## Errormator is tailored to work with RhodeCode, see
294 ## http://errormator.com for details how to obtain an account
295 ## you must install python package `errormator_client` to make it work
273 296
274 # errormator enabled
275 errormator = true
297 ## errormator enabled
298 errormator = false
276 299
277 300 errormator.server_url = https://api.errormator.com
278 301 errormator.api_key = YOUR_API_KEY
279 302
280 # TWEAK AMOUNT OF INFO SENT HERE
303 ## TWEAK AMOUNT OF INFO SENT HERE
281 304
282 # enables 404 error logging (default False)
305 ## enables 404 error logging (default False)
283 306 errormator.report_404 = false
284 307
285 # time in seconds after request is considered being slow (default 1)
308 ## time in seconds after request is considered being slow (default 1)
286 309 errormator.slow_request_time = 1
287 310
288 # record slow requests in application
289 # (needs to be enabled for slow datastore recording and time tracking)
311 ## record slow requests in application
312 ## (needs to be enabled for slow datastore recording and time tracking)
290 313 errormator.slow_requests = true
291 314
292 # enable hooking to application loggers
315 ## enable hooking to application loggers
293 316 # errormator.logging = true
294 317
295 # minimum log level for log capture
318 ## minimum log level for log capture
296 319 # errormator.logging.level = WARNING
297 320
298 # send logs only from erroneous/slow requests
299 # (saves API quota for intensive logging)
321 ## send logs only from erroneous/slow requests
322 ## (saves API quota for intensive logging)
300 323 errormator.logging_on_error = false
301 324
302 # list of additonal keywords that should be grabbed from environ object
303 # can be string with comma separated list of words in lowercase
304 # (by default client will always send following info:
305 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
306 # start with HTTP* this list be extended with additional keywords here
325 ## list of additonal keywords that should be grabbed from environ object
326 ## can be string with comma separated list of words in lowercase
327 ## (by default client will always send following info:
328 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
329 ## start with HTTP* this list be extended with additional keywords here
307 330 errormator.environ_keys_whitelist =
308 331
309 332
310 # list of keywords that should be blanked from request object
311 # can be string with comma separated list of words in lowercase
312 # (by default client will always blank keys that contain following words
313 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
314 # this list be extended with additional keywords set here
333 ## list of keywords that should be blanked from request object
334 ## can be string with comma separated list of words in lowercase
335 ## (by default client will always blank keys that contain following words
336 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
337 ## this list be extended with additional keywords set here
315 338 errormator.request_keys_blacklist =
316 339
317 340
318 # list of namespaces that should be ignores when gathering log entries
319 # can be string with comma separated list of namespaces
320 # (by default the client ignores own entries: errormator_client.client)
341 ## list of namespaces that should be ignores when gathering log entries
342 ## can be string with comma separated list of namespaces
343 ## (by default the client ignores own entries: errormator_client.client)
321 344 errormator.log_namespace_blacklist =
322 345
323 346
@@ -325,8 +348,8 b' errormator.log_namespace_blacklist ='
325 348 ### [sentry] ###
326 349 ################
327 350
328 # sentry is a alternative open source error aggregator
329 # you must install python packages `sentry` and `raven` to enable
351 ## sentry is a alternative open source error aggregator
352 ## you must install python packages `sentry` and `raven` to enable
330 353
331 354 sentry.dsn = YOUR_DNS
332 355 sentry.servers =
@@ -396,7 +419,7 b' handlers = console'
396 419 level = DEBUG
397 420 handlers =
398 421 qualname = routes.middleware
399 # "level = DEBUG" logs the route matched and routing variables.
422 ## "level = DEBUG" logs the route matched and routing variables.
400 423 propagate = 1
401 424
402 425 [logger_beaker]
@@ -43,7 +43,8 b' from webhelpers.html.tags import _set_in'
43 43 from rhodecode.lib.annotate import annotate_highlight
44 44 from rhodecode.lib.utils import repo_name_slug, get_custom_lexer
45 45 from rhodecode.lib.utils2 import str2bool, safe_unicode, safe_str, \
46 get_changeset_safe, datetime_to_time, time_to_datetime, AttributeDict
46 get_changeset_safe, datetime_to_time, time_to_datetime, AttributeDict,\
47 safe_int
47 48 from rhodecode.lib.markup_renderer import MarkupRenderer
48 49 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
49 50 from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyChangeset
@@ -363,13 +364,31 b' from rhodecode.lib.vcs.utils import auth'
363 364 from rhodecode.lib.utils2 import credentials_filter, age as _age
364 365 from rhodecode.model.db import User, ChangesetStatus
365 366
366 age = lambda x,y=False: _age(x,y)
367 age = lambda x, y=False: _age(x, y)
367 368 capitalize = lambda x: x.capitalize()
368 369 email = author_email
369 370 short_id = lambda x: x[:12]
370 371 hide_credentials = lambda x: ''.join(credentials_filter(x))
371 372
372 373
374 def show_id(cs):
375 """
376 Configurable function that shows ID
377 by default it's r123:fffeeefffeee
378
379 :param cs: changeset instance
380 """
381 from rhodecode import CONFIG
382 def_len = safe_int(CONFIG['sha_len'])
383 show_rev = str2bool(CONFIG['sha_rev'])
384
385 raw_id = cs.raw_id[:def_len]
386 if show_rev:
387 return 'r%s:%s' % (cs.revision, raw_id)
388 else:
389 return '%s' % (raw_id)
390
391
373 392 def fmt_date(date):
374 393 if date:
375 394 _fmt = _(u"%a, %d %b %Y %H:%M:%S").encode('utf8')
@@ -64,8 +64,7 b''
64 64 </td>
65 65 <td class="hash">
66 66 <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}">
67 <span class="changeset_id">${cs.revision}:</span>
68 <span class="changeset_hash">${h.short_id(cs.raw_id)}</span>
67 <span class="changeset_hash">${h.show_id(cs)}</span>
69 68 </a>
70 69 </td>
71 70 <td class="date">
@@ -15,11 +15,9 b' class TestChangelogController(TestContro'
15 15 """name="5e204e7583b9c8e7b93a020bd036564b1e731dae" """
16 16 """type="checkbox" value="1" />"""
17 17 )
18
18 19 response.mustcontain(
19 """<span class="changeset_id">154:</span>"""
20 )
21 response.mustcontain(
22 """<span class="changeset_hash">5e204e7583b9</span>"""
20 """<span class="changeset_hash">r154:5e204e7583b9</span>"""
23 21 )
24 22
25 23 response.mustcontain("""Small update at simplevcs app""")
@@ -31,16 +29,18 b' class TestChangelogController(TestContro'
31 29 # """more details">3</div>"""
32 30 # )
33 31
32 def test_index_pagination_hg(self):
33 self.log_user()
34 34 #pagination
35 response = self.app.get(url(controller='changelog', action='index',
35 self.app.get(url(controller='changelog', action='index',
36 36 repo_name=HG_REPO), {'page': 1})
37 response = self.app.get(url(controller='changelog', action='index',
37 self.app.get(url(controller='changelog', action='index',
38 38 repo_name=HG_REPO), {'page': 2})
39 response = self.app.get(url(controller='changelog', action='index',
39 self.app.get(url(controller='changelog', action='index',
40 40 repo_name=HG_REPO), {'page': 3})
41 response = self.app.get(url(controller='changelog', action='index',
41 self.app.get(url(controller='changelog', action='index',
42 42 repo_name=HG_REPO), {'page': 4})
43 response = self.app.get(url(controller='changelog', action='index',
43 self.app.get(url(controller='changelog', action='index',
44 44 repo_name=HG_REPO), {'page': 5})
45 45 response = self.app.get(url(controller='changelog', action='index',
46 46 repo_name=HG_REPO), {'page': 6})
@@ -52,11 +52,9 b' class TestChangelogController(TestContro'
52 52 """name="46ad32a4f974e45472a898c6b0acb600320579b1" """
53 53 """type="checkbox" value="1" />"""
54 54 )
55
55 56 response.mustcontain(
56 """<span class="changeset_id">64:</span>"""
57 )
58 response.mustcontain(
59 """<span class="changeset_hash">46ad32a4f974</span>"""
57 """<span class="changeset_hash">r64:46ad32a4f974</span>"""
60 58 )
61 59
62 60 # response.mustcontain(
@@ -72,3 +70,57 b' class TestChangelogController(TestContro'
72 70 # """title="Merge with 2e6a2bf9356ca56df08807f4ad86d480da72a8f4">"""
73 71 # """46ad32a4f974</a>""" % HG_REPO
74 72 # )
73
74 def test_index_git(self):
75 self.log_user()
76 response = self.app.get(url(controller='changelog', action='index',
77 repo_name=GIT_REPO))
78
79 response.mustcontain('''id="chg_20" class="container tablerow1"''')
80 response.mustcontain(
81 """<input class="changeset_range" """
82 """id="95f9a91d775b0084b2368ae7779e44931c849c0e" """
83 """name="95f9a91d775b0084b2368ae7779e44931c849c0e" """
84 """type="checkbox" value="1" />"""
85 )
86
87 response.mustcontain(
88 """<span class="changeset_hash">r613:95f9a91d775b</span>"""
89 )
90
91 response.mustcontain("""fixing stupid typo in context for mercurial""")
92
93 # response.mustcontain(
94 # """<div id="changed_total_5e204e7583b9c8e7b93a020bd036564b1e731dae" """
95 # """style="float:right;" class="changed_total tooltip" """
96 # """title="Affected number of files, click to show """
97 # """more details">3</div>"""
98 # )
99
100 def test_index_pagination_git(self):
101 self.log_user()
102 #pagination
103 self.app.get(url(controller='changelog', action='index',
104 repo_name=GIT_REPO), {'page': 1})
105 self.app.get(url(controller='changelog', action='index',
106 repo_name=GIT_REPO), {'page': 2})
107 self.app.get(url(controller='changelog', action='index',
108 repo_name=GIT_REPO), {'page': 3})
109 self.app.get(url(controller='changelog', action='index',
110 repo_name=GIT_REPO), {'page': 4})
111 self.app.get(url(controller='changelog', action='index',
112 repo_name=GIT_REPO), {'page': 5})
113 response = self.app.get(url(controller='changelog', action='index',
114 repo_name=GIT_REPO), {'page': 6})
115
116 # Test response after pagination...
117 response.mustcontain(
118 """<input class="changeset_range" """
119 """id="636ed213f2f11ef91071b9c24f2d5e6bd01a6ed5" """
120 """name="636ed213f2f11ef91071b9c24f2d5e6bd01a6ed5" """
121 """type="checkbox" value="1" />"""
122 )
123
124 response.mustcontain(
125 """<span class="changeset_hash">r515:636ed213f2f1</span>"""
126 )
@@ -25,69 +25,88 b' pdebug = false'
25 25 #smtp_port =
26 26 #smtp_use_tls = false
27 27 #smtp_use_ssl = true
28 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
28 ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
29 29 #smtp_auth =
30 30
31 31 [server:main]
32 32 ## PASTE
33 ##nr of threads to spawn
33 ## nr of threads to spawn
34 34 #threadpool_workers = 5
35 35
36 ##max request before thread respawn
36 ## max request before thread respawn
37 37 #threadpool_max_requests = 10
38 38
39 ##option to use threads of process
39 ## option to use threads of process
40 40 #use_threadpool = true
41 41
42 42 #use = egg:Paste#http
43 43
44 #WAITRESS
44 ## WAITRESS
45 45 threads = 5
46 #100GB
46 ## 100GB
47 47 max_request_body_size = 107374182400
48 48 use = egg:waitress#main
49 49
50 50 host = 127.0.0.1
51 51 port = 5000
52 52
53 [filter:proxy-prefix]
54 # prefix middleware for rc
55 use = egg:PasteDeploy#prefix
56 prefix = /<your-prefix>
53 ## prefix middleware for rc
54 #[filter:proxy-prefix]
55 #use = egg:PasteDeploy#prefix
56 #prefix = /<your-prefix>
57 57
58 58 [app:main]
59 59 use = egg:rhodecode
60 ## enable proxy prefix middleware
60 61 #filter-with = proxy-prefix
62
61 63 full_stack = true
62 64 static_files = true
63 # Optional Languages
64 # en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 ## Optional Languages
66 ## en, fr, ja, pt_BR, zh_CN, zh_TW, pl
65 67 lang = en
66 68 cache_dir = /tmp/rc/data
67 69 index_dir = /tmp/rc/index
68 # set this path to use archive download cache
69 #archive_cache_dir = /tmp/rhodecode_tarballcache
70 app_instance_uuid = develop-test
70
71 ## uncomment and set this path to use archive download cache
72 #archive_cache_dir = /tmp/tarballcache
73
74 ## change this to unique ID for security
75 app_instance_uuid = rc-production
76
77 ## cut off limit for large diffs (size in bytes)
71 78 cut_off_limit = 256000
72 vcs_full_cache = False
73 # force https in RhodeCode, fixes https redirects, assumes it's always https
79
80 ## use cache version of scm repo everywhere
81 vcs_full_cache = false
82
83 ## force https in RhodeCode, fixes https redirects, assumes it's always https
74 84 force_https = false
75 # use Strict-Transport-Security headers
85
86 ## use Strict-Transport-Security headers
76 87 use_htsts = false
88
89 ## number of commits stats will parse on each iteration
77 90 commit_parse_limit = 25
78 # number of items displayed in lightweight dashboard before paginating
91
92 ## number of items displayed in lightweight dashboard before paginating is shown
79 93 dashboard_items = 100
94
95 ## use gravatar service to display avatars
80 96 use_gravatar = true
81 97
82 # path to git executable
98 ## path to git executable
83 99 git_path = git
84 100
85 101 ## RSS feed options
86
87 102 rss_cut_off_limit = 256000
88 103 rss_items_per_page = 10
89 104 rss_include_diff = false
90 105
106 ## show hash options for changelog
107 sha_len = 12
108 sha_rev = true
109
91 110
92 111 ## alternative_gravatar_url allows you to use your own avatar server application
93 112 ## the following parts of the URL will be replaced
@@ -99,8 +118,11 b' rss_include_diff = false'
99 118 #alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
100 119 #alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
101 120
121
122 ## container auth options
102 123 container_auth_enabled = false
103 124 proxypass_auth_enabled = false
125
104 126 ## default encoding used to convert from and to unicode
105 127 ## can be also a comma seperated list of encoding in case of mixed encodings
106 128 default_encoding = utf8
@@ -156,6 +178,11 b' instance_id ='
156 178 ## handling that. Set this variable to 403 to return HTTPForbidden
157 179 auth_ret_code =
158 180
181 ## locking return code. When repository is locked return this HTTP code. 2XX
182 ## codes don't break the transactions while 4XX codes do
183 lock_ret_code = 423
184
185
159 186 ####################################
160 187 ### CELERY CONFIG ####
161 188 ####################################
@@ -180,7 +207,7 b' celeryd.concurrency = 2'
180 207 celeryd.log.level = debug
181 208 celeryd.max.tasks.per.child = 1
182 209
183 #tasks will never be sent to the queue, but executed locally instead.
210 ## tasks will never be sent to the queue, but executed locally instead.
184 211 celery.always.eager = false
185 212
186 213 ####################################
@@ -236,18 +263,19 b' beaker.cache.sql_cache_long.key_length ='
236 263
237 264
238 265 beaker.session.key = rhodecode
239 ## secure cookie requires AES python libraries ##
240 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
241 #beaker.session.validate_key = 9712sds2212c--zxc123
266 ## secure cookie requires AES python libraries
267 #beaker.session.encrypt_key = <key_for_encryption>
268 #beaker.session.validate_key = <validation_key>
269
242 270 ## sets session as invalid if it haven't been accessed for given amount of time
243 271 beaker.session.timeout = 3600
244 272 beaker.session.httponly = true
245 273 #beaker.session.cookie_path = /<your-prefix>
246 274
247 ## uncomment for https secure cookie ##
275 ## uncomment for https secure cookie
248 276 beaker.session.secure = false
249 277
250 ## auto save the session to not to use .save() ##
278 ## auto save the session to not to use .save()
251 279 beaker.session.auto = False
252 280
253 281 ## default cookie expiration time in seconds `true` expire at browser close ##
@@ -262,57 +290,57 b' beaker.session.auto = False'
262 290 ### [errormator] ###
263 291 ####################
264 292
265 # Errormator is tailored to work with RhodeCode, see
266 # http://errormator.com for details how to obtain an account
267 # you must install python package `errormator_client` to make it work
293 ## Errormator is tailored to work with RhodeCode, see
294 ## http://errormator.com for details how to obtain an account
295 ## you must install python package `errormator_client` to make it work
268 296
269 # errormator enabled
270 errormator = true
297 ## errormator enabled
298 errormator = false
271 299
272 300 errormator.server_url = https://api.errormator.com
273 301 errormator.api_key = YOUR_API_KEY
274 302
275 # TWEAK AMOUNT OF INFO SENT HERE
303 ## TWEAK AMOUNT OF INFO SENT HERE
276 304
277 # enables 404 error logging (default False)
305 ## enables 404 error logging (default False)
278 306 errormator.report_404 = false
279 307
280 # time in seconds after request is considered being slow (default 1)
308 ## time in seconds after request is considered being slow (default 1)
281 309 errormator.slow_request_time = 1
282 310
283 # record slow requests in application
284 # (needs to be enabled for slow datastore recording and time tracking)
311 ## record slow requests in application
312 ## (needs to be enabled for slow datastore recording and time tracking)
285 313 errormator.slow_requests = true
286 314
287 # enable hooking to application loggers
315 ## enable hooking to application loggers
288 316 # errormator.logging = true
289 317
290 # minimum log level for log capture
318 ## minimum log level for log capture
291 319 # errormator.logging.level = WARNING
292 320
293 # send logs only from erroneous/slow requests
294 # (saves API quota for intensive logging)
321 ## send logs only from erroneous/slow requests
322 ## (saves API quota for intensive logging)
295 323 errormator.logging_on_error = false
296 324
297 # list of additonal keywords that should be grabbed from environ object
298 # can be string with comma separated list of words in lowercase
299 # (by default client will always send following info:
300 # 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
301 # start with HTTP* this list be extended with additional keywords here
325 ## list of additonal keywords that should be grabbed from environ object
326 ## can be string with comma separated list of words in lowercase
327 ## (by default client will always send following info:
328 ## 'REMOTE_USER', 'REMOTE_ADDR', 'SERVER_NAME', 'CONTENT_TYPE' + all keys that
329 ## start with HTTP* this list be extended with additional keywords here
302 330 errormator.environ_keys_whitelist =
303 331
304 332
305 # list of keywords that should be blanked from request object
306 # can be string with comma separated list of words in lowercase
307 # (by default client will always blank keys that contain following words
308 # 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
309 # this list be extended with additional keywords set here
333 ## list of keywords that should be blanked from request object
334 ## can be string with comma separated list of words in lowercase
335 ## (by default client will always blank keys that contain following words
336 ## 'password', 'passwd', 'pwd', 'auth_tkt', 'secret', 'csrf'
337 ## this list be extended with additional keywords set here
310 338 errormator.request_keys_blacklist =
311 339
312 340
313 # list of namespaces that should be ignores when gathering log entries
314 # can be string with comma separated list of namespaces
315 # (by default the client ignores own entries: errormator_client.client)
341 ## list of namespaces that should be ignores when gathering log entries
342 ## can be string with comma separated list of namespaces
343 ## (by default the client ignores own entries: errormator_client.client)
316 344 errormator.log_namespace_blacklist =
317 345
318 346
@@ -320,8 +348,8 b' errormator.log_namespace_blacklist ='
320 348 ### [sentry] ###
321 349 ################
322 350
323 # sentry is a alternative open source error aggregator
324 # you must install python packages `sentry` and `raven` to enable
351 ## sentry is a alternative open source error aggregator
352 ## you must install python packages `sentry` and `raven` to enable
325 353
326 354 sentry.dsn = YOUR_DNS
327 355 sentry.servers =
@@ -366,10 +394,10 b' sqlalchemy.db1.convert_unicode = true'
366 394 keys = root, routes, rhodecode, sqlalchemy, beaker, templates, whoosh_indexer
367 395
368 396 [handlers]
369 keys = console
397 keys = console, console_sql
370 398
371 399 [formatters]
372 keys = generic, color_formatter
400 keys = generic, color_formatter, color_formatter_sql
373 401
374 402 #############
375 403 ## LOGGERS ##
@@ -382,7 +410,7 b' handlers = console'
382 410 level = DEBUG
383 411 handlers =
384 412 qualname = routes.middleware
385 # "level = DEBUG" logs the route matched and routing variables.
413 ## "level = DEBUG" logs the route matched and routing variables.
386 414 propagate = 1
387 415
388 416 [logger_beaker]
@@ -425,6 +453,12 b' args = (sys.stderr,)'
425 453 level = NOTSET
426 454 formatter = generic
427 455
456 [handler_console_sql]
457 class = StreamHandler
458 args = (sys.stderr,)
459 level = WARN
460 formatter = generic
461
428 462 ################
429 463 ## FORMATTERS ##
430 464 ################
@@ -437,3 +471,8 b' datefmt = %Y-%m-%d %H:%M:%S'
437 471 class=rhodecode.lib.colored_formatter.ColorFormatter
438 472 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
439 473 datefmt = %Y-%m-%d %H:%M:%S
474
475 [formatter_color_formatter_sql]
476 class=rhodecode.lib.colored_formatter.ColorFormatterSql
477 format= %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
478 datefmt = %Y-%m-%d %H:%M:%S
General Comments 0
You need to be logged in to leave comments. Login now