# HG changeset patch # User Marcin Kuzminski # Date 2017-09-25 17:33:16 # Node ID 3691193078afbcfb9b9edae639807531cb040ef7 # Parent 5fdda31e0d15207ed7b8b88c8bfe0088692a1184 config: updated .ini files. diff --git a/configs/development.ini b/configs/development.ini --- a/configs/development.ini +++ b/configs/development.ini @@ -73,7 +73,7 @@ asyncore_use_poll = true ## The `instance_id = *` must be set in the [app:main] section below #workers = 2 ## number of threads for each of the worker, must be set to 1 for gevent -## generally recommened to be at 1 +## generally recommended to be at 1 #threads = 1 ## process name #proc_name = rhodecode @@ -601,15 +601,16 @@ svn.proxy.location_root = / ### SSH Support Settings ### ############################################################ -## Defines if the authorized_keys file should be written on any change of -## user ssh keys, setting this to false also disables posibility of adding -## ssh keys for users from web interface. +## Defines if a custom authorized_keys file should be created and written on +## any change user ssh keys. Setting this to false also disables posibility +## of adding SSH keys by users from web interface. Super admins can still +## manage SSH Keys. ssh.generate_authorized_keyfile = false ## Options for ssh, default is `no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding` # ssh.authorized_keys_ssh_opts = -## File to generate the authorized keys together with options +## Path to the authrozied_keys file where the generate entries are placed. ## It is possible to have multiple key files specified in `sshd_config` e.g. ## AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_rhodecode ssh.authorized_keys_file_path = ~/.ssh/authorized_keys_rhodecode @@ -622,9 +623,9 @@ ssh.wrapper_cmd = ~/.rccontrol/community ## Allow shell when executing the ssh-wrapper command ssh.wrapper_cmd_allow_shell = false -## Enables logging, and detailed output send back to the client. Usefull for -## debugging, shouldn't be used in production. -ssh.enable_debug_logging = false +## Enables logging, and detailed output send back to the client during SSH +## operations. Usefull for debugging, shouldn't be used in production. +ssh.enable_debug_logging = true ## API KEY for user who has access to fetch other user permission information ## most likely an super-admin account with some IP restrictions. @@ -634,7 +635,7 @@ ssh.api_key = ## access ssh.api_host = http://localhost -## Paths to binary executrables, by default they are the names, but we can +## Paths to binary executable, by default they are the names, but we can ## override them if we want to use a custom one ssh.executable.hg = ~/.rccontrol/vcsserver-1/profile/bin/hg ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git @@ -650,7 +651,7 @@ custom.conf = 1 ### LOGGING CONFIGURATION #### ################################ [loggers] -keys = root, routes, rhodecode, sqlalchemy, beaker, templates, ssh_wrapper +keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper [handlers] keys = console, console_sql @@ -665,12 +666,11 @@ keys = generic, color_formatter, color_f level = NOTSET handlers = console -[logger_routes] -level = DEBUG -handlers = -qualname = routes.middleware -## "level = DEBUG" logs the route matched and routing variables. -propagate = 1 +[logger_sqlalchemy] +level = INFO +handlers = console_sql +qualname = sqlalchemy.engine +propagate = 0 [logger_beaker] level = DEBUG @@ -678,24 +678,12 @@ handlers = qualname = beaker.container propagate = 1 -[logger_templates] -level = INFO -handlers = -qualname = pylons.templating -propagate = 1 - [logger_rhodecode] level = DEBUG handlers = qualname = rhodecode propagate = 1 -[logger_sqlalchemy] -level = INFO -handlers = console_sql -qualname = sqlalchemy.engine -propagate = 0 - [logger_ssh_wrapper] level = DEBUG handlers = diff --git a/configs/production.ini b/configs/production.ini --- a/configs/production.ini +++ b/configs/production.ini @@ -73,7 +73,7 @@ use = egg:gunicorn#main ## The `instance_id = *` must be set in the [app:main] section below workers = 2 ## number of threads for each of the worker, must be set to 1 for gevent -## generally recommened to be at 1 +## generally recommended to be at 1 #threads = 1 ## process name proc_name = rhodecode @@ -570,15 +570,16 @@ svn.proxy.location_root = / ### SSH Support Settings ### ############################################################ -## Defines if the authorized_keys file should be written on any change of -## user ssh keys, setting this to false also disables posibility of adding -## ssh keys for users from web interface. +## Defines if a custom authorized_keys file should be created and written on +## any change user ssh keys. Setting this to false also disables posibility +## of adding SSH keys by users from web interface. Super admins can still +## manage SSH Keys. ssh.generate_authorized_keyfile = false ## Options for ssh, default is `no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding` # ssh.authorized_keys_ssh_opts = -## File to generate the authorized keys together with options +## Path to the authrozied_keys file where the generate entries are placed. ## It is possible to have multiple key files specified in `sshd_config` e.g. ## AuthorizedKeysFile %h/.ssh/authorized_keys %h/.ssh/authorized_keys_rhodecode ssh.authorized_keys_file_path = ~/.ssh/authorized_keys_rhodecode @@ -591,8 +592,8 @@ ssh.wrapper_cmd = ~/.rccontrol/community ## Allow shell when executing the ssh-wrapper command ssh.wrapper_cmd_allow_shell = false -## Enables logging, and detailed output send back to the client. Usefull for -## debugging, shouldn't be used in production. +## Enables logging, and detailed output send back to the client during SSH +## operations. Usefull for debugging, shouldn't be used in production. ssh.enable_debug_logging = false ## API KEY for user who has access to fetch other user permission information @@ -603,7 +604,7 @@ ssh.api_key = ## access ssh.api_host = http://localhost -## Paths to binary executrables, by default they are the names, but we can +## Paths to binary executable, by default they are the names, but we can ## override them if we want to use a custom one ssh.executable.hg = ~/.rccontrol/vcsserver-1/profile/bin/hg ssh.executable.git = ~/.rccontrol/vcsserver-1/profile/bin/git @@ -619,7 +620,7 @@ custom.conf = 1 ### LOGGING CONFIGURATION #### ################################ [loggers] -keys = root, routes, rhodecode, sqlalchemy, beaker, templates, ssh_wrapper +keys = root, sqlalchemy, beaker, rhodecode, ssh_wrapper [handlers] keys = console, console_sql @@ -634,12 +635,11 @@ keys = generic, color_formatter, color_f level = NOTSET handlers = console -[logger_routes] -level = DEBUG -handlers = -qualname = routes.middleware -## "level = DEBUG" logs the route matched and routing variables. -propagate = 1 +[logger_sqlalchemy] +level = INFO +handlers = console_sql +qualname = sqlalchemy.engine +propagate = 0 [logger_beaker] level = DEBUG @@ -647,24 +647,12 @@ handlers = qualname = beaker.container propagate = 1 -[logger_templates] -level = INFO -handlers = -qualname = pylons.templating -propagate = 1 - [logger_rhodecode] level = DEBUG handlers = qualname = rhodecode propagate = 1 -[logger_sqlalchemy] -level = INFO -handlers = console_sql -qualname = sqlalchemy.engine -propagate = 0 - [logger_ssh_wrapper] level = DEBUG handlers =