Mercurial > kallithea

changeset 4501:a68fc4abeda3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
issue #7 remove obsolete configuration
author domruf <dominikruf@gmail.com>
date Wed, 27 Aug 2014 21:50:25 +0200
parents e69d34136be5
children 5d45eacd6944
files development.ini docs/setup.rst kallithea/bin/template.ini.mako kallithea/config/deployment.ini_tmpl production.ini test.ini
diffstat 6 files changed, 2 insertions(+), 150 deletions(-) [+]
line wrap: on
line diff
--- a/development.ini	Sun Aug 31 12:11:50 2014 +0200
+++ b/development.ini	Wed Aug 27 21:50:25 2014 +0200
@@ -178,9 +178,6 @@
 ## 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 @@
 #    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
 
--- a/docs/setup.rst	Sun Aug 31 12:11:50 2014 +0200
+++ b/docs/setup.rst	Wed Aug 27 21:50:25 2014 +0200
@@ -368,7 +368,7 @@
 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 @@
 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 @@
 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 @@
       RequestHeader set X-Forwarded-User %{RU}e
     </Location>
 
-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
--- a/kallithea/bin/template.ini.mako	Sun Aug 31 12:11:50 2014 +0200
+++ b/kallithea/bin/template.ini.mako	Wed Aug 27 21:50:25 2014 +0200
@@ -175,9 +175,6 @@
 <%text>## number of commits stats will parse on each iteration</%text>
 commit_parse_limit = 25
 
-<%text>## use gravatar service to display avatars</%text>
-use_gravatar = true
-
 <%text>## path to git executable</%text>
 git_path = git
 
@@ -212,35 +209,10 @@
 #    FilesController:raw,
 #    FilesController:archivefile
 
-<%text>## alternative_gravatar_url allows you to use your own avatar server application</%text>
-<%text>## the following parts of the URL will be replaced</%text>
-<%text>## {email}        user email</%text>
-<%text>## {md5email}     md5 hash of the user email (like at gravatar.com)</%text>
-<%text>## {size}         size of the image that is expected from the server application</%text>
-<%text>## {scheme}       http/https from Kallithea server</%text>
-<%text>## {netloc}       network location from Kallithea server</%text>
-#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}
-#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}
-
-
-<%text>## container auth options</%text>
-container_auth_enabled = false
-proxypass_auth_enabled = false
-
 <%text>## default encoding used to convert from and to unicode</%text>
 <%text>## can be also a comma seperated list of encoding in case of mixed encodings</%text>
 default_encoding = utf8
 
-<%text>## overwrite schema of clone url</%text>
-<%text>## available vars:</%text>
-<%text>## scheme - http/https</%text>
-<%text>## user - current user</%text>
-<%text>## pass - password</%text>
-<%text>## netloc - network location</%text>
-<%text>## path - usually repo_name</%text>
-
-#clone_uri = {scheme}://{user}{pass}{netloc}{path}
-
 <%text>## issue tracker for Kallithea (leave blank to disable, absent for default)</%text>
 #bugtracker = https://bitbucket.org/conservancy/kallithea/issues
 
--- a/kallithea/config/deployment.ini_tmpl	Sun Aug 31 12:11:50 2014 +0200
+++ b/kallithea/config/deployment.ini_tmpl	Wed Aug 27 21:50:25 2014 +0200
@@ -172,9 +172,6 @@
 ## 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 @@
 #    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
 
--- a/production.ini	Sun Aug 31 12:11:50 2014 +0200
+++ b/production.ini	Wed Aug 27 21:50:25 2014 +0200
@@ -176,9 +176,6 @@
 ## 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 @@
 #    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
 
--- a/test.ini	Sun Aug 31 12:11:50 2014 +0200
+++ b/test.ini	Wed Aug 27 21:50:25 2014 +0200
@@ -178,9 +178,6 @@
 ## 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 @@
 #    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