diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -178,9 +178,6 @@ use_htsts = false ## number of commits stats will parse on each iteration commit_parse_limit = 25 -## use gravatar service to display avatars -use_gravatar = true - ## path to git executable git_path = git @@ -215,35 +212,10 @@ api_access_controllers_whitelist = # FilesController:raw, # FilesController:archivefile -## alternative_gravatar_url allows you to use your own avatar server application -## the following parts of the URL will be replaced -## {email} user email -## {md5email} md5 hash of the user email (like at gravatar.com) -## {size} size of the image that is expected from the server application -## {scheme} http/https from Kallithea server -## {netloc} network location from Kallithea server -#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size} -#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size} - - -## container auth options -container_auth_enabled = false -proxypass_auth_enabled = false - ## default encoding used to convert from and to unicode ## can be also a comma seperated list of encoding in case of mixed encodings default_encoding = utf8 -## overwrite schema of clone url -## available vars: -## scheme - http/https -## user - current user -## pass - password -## netloc - network location -## path - usually repo_name - -#clone_uri = {scheme}://{user}{pass}{netloc}{path} - ## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -368,7 +368,7 @@ appropriately configured. Authentication by container or reverse-proxy -------------------------------------------- -Starting with version 1.3, Kallithea supports delegating the authentication +Kallithea supports delegating the authentication of users to its WSGI container, or to a reverse-proxy server through which all clients access the application. @@ -383,6 +383,7 @@ administrator can then modify it using K It's also possible for an administrator to create accounts and configure their permissions before the user logs in for the first time. + Container-based authentication '''''''''''''''''''''''''''''' @@ -393,11 +394,6 @@ After setting up your container (see `Ap to configure it to require authentication on the location configured for Kallithea. -In order for Kallithea to start using the provided username, you should set the -following in the [app:main] section of your .ini file:: - - container_auth_enabled = true - Proxy pass-through authentication ''''''''''''''''''''''''''''''''' @@ -432,10 +428,6 @@ reverse-proxy setup with basic auth:: RequestHeader set X-Forwarded-User %{RU}e -In order for Kallithea to start using the forwarded username, you should set -the following in the [app:main] section of your .ini file:: - - proxypass_auth_enabled = true .. note:: If you enable proxy pass-through authentication, make sure your server is 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 @@ -175,9 +175,6 @@ use_htsts = false <%text>## number of commits stats will parse on each iteration commit_parse_limit = 25 -<%text>## use gravatar service to display avatars -use_gravatar = true - <%text>## path to git executable git_path = git @@ -212,35 +209,10 @@ api_access_controllers_whitelist = # FilesController:raw, # FilesController:archivefile -<%text>## alternative_gravatar_url allows you to use your own avatar server application -<%text>## the following parts of the URL will be replaced -<%text>## {email} user email -<%text>## {md5email} md5 hash of the user email (like at gravatar.com) -<%text>## {size} size of the image that is expected from the server application -<%text>## {scheme} http/https from Kallithea server -<%text>## {netloc} network location from Kallithea server -#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size} -#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size} - - -<%text>## container auth options -container_auth_enabled = false -proxypass_auth_enabled = false - <%text>## default encoding used to convert from and to unicode <%text>## can be also a comma seperated list of encoding in case of mixed encodings default_encoding = utf8 -<%text>## overwrite schema of clone url -<%text>## available vars: -<%text>## scheme - http/https -<%text>## user - current user -<%text>## pass - password -<%text>## netloc - network location -<%text>## path - usually repo_name - -#clone_uri = {scheme}://{user}{pass}{netloc}{path} - <%text>## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues 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 @@ -172,9 +172,6 @@ use_htsts = false ## number of commits stats will parse on each iteration commit_parse_limit = 25 -## use gravatar service to display avatars -use_gravatar = true - ## path to git executable git_path = git @@ -209,35 +206,10 @@ api_access_controllers_whitelist = # FilesController:raw, # FilesController:archivefile -## alternative_gravatar_url allows you to use your own avatar server application -## the following parts of the URL will be replaced -## {email} user email -## {md5email} md5 hash of the user email (like at gravatar.com) -## {size} size of the image that is expected from the server application -## {scheme} http/https from Kallithea server -## {netloc} network location from Kallithea server -#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size} -#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size} - - -## container auth options -container_auth_enabled = false -proxypass_auth_enabled = false - ## default encoding used to convert from and to unicode ## can be also a comma seperated list of encoding in case of mixed encodings default_encoding = utf8 -## overwrite schema of clone url -## available vars: -## scheme - http/https -## user - current user -## pass - password -## netloc - network location -## path - usually repo_name - -#clone_uri = {scheme}://{user}{pass}{netloc}{path} - ## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues diff --git a/production.ini b/production.ini --- a/production.ini +++ b/production.ini @@ -176,9 +176,6 @@ use_htsts = false ## number of commits stats will parse on each iteration commit_parse_limit = 25 -## use gravatar service to display avatars -use_gravatar = true - ## path to git executable git_path = git @@ -213,35 +210,10 @@ api_access_controllers_whitelist = # FilesController:raw, # FilesController:archivefile -## alternative_gravatar_url allows you to use your own avatar server application -## the following parts of the URL will be replaced -## {email} user email -## {md5email} md5 hash of the user email (like at gravatar.com) -## {size} size of the image that is expected from the server application -## {scheme} http/https from Kallithea server -## {netloc} network location from Kallithea server -#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size} -#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size} - - -## container auth options -container_auth_enabled = false -proxypass_auth_enabled = false - ## default encoding used to convert from and to unicode ## can be also a comma seperated list of encoding in case of mixed encodings default_encoding = utf8 -## overwrite schema of clone url -## available vars: -## scheme - http/https -## user - current user -## pass - password -## netloc - network location -## path - usually repo_name - -#clone_uri = {scheme}://{user}{pass}{netloc}{path} - ## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues diff --git a/test.ini b/test.ini --- a/test.ini +++ b/test.ini @@ -178,9 +178,6 @@ use_htsts = false ## number of commits stats will parse on each iteration commit_parse_limit = 25 -## use gravatar service to display avatars -use_gravatar = true - ## path to git executable git_path = git @@ -215,35 +212,10 @@ api_access_controllers_whitelist = # FilesController:raw, # FilesController:archivefile -## alternative_gravatar_url allows you to use your own avatar server application -## the following parts of the URL will be replaced -## {email} user email -## {md5email} md5 hash of the user email (like at gravatar.com) -## {size} size of the image that is expected from the server application -## {scheme} http/https from Kallithea server -## {netloc} network location from Kallithea server -#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size} -#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size} - - -## container auth options -container_auth_enabled = false -proxypass_auth_enabled = false - ## default encoding used to convert from and to unicode ## can be also a comma seperated list of encoding in case of mixed encodings default_encoding = utf8 -## overwrite schema of clone url -## available vars: -## scheme - http/https -## user - current user -## pass - password -## netloc - network location -## path - usually repo_name - -#clone_uri = {scheme}://{user}{pass}{netloc}{path} - ## issue tracker for Kallithea (leave blank to disable, absent for default) #bugtracker = https://bitbucket.org/conservancy/kallithea/issues