diff --git a/development.ini b/development.ini --- a/development.ini +++ b/development.ini @@ -191,8 +191,8 @@ show_revision_number = true ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/. -## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/ +## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = ## white list of API enabled controllers. This allows to add list of diff --git a/docs/api/api.rst b/docs/api/api.rst --- a/docs/api/api.rst +++ b/docs/api/api.rst @@ -84,7 +84,7 @@ will be available. To get started quickly simply run:: - rhodecode-api _create_config --apikey= --apihost= + rhodecode-api _create_config --apikey= --apihost= This will create a file named .config in the directory you executed it storing json config file with credentials. You can skip this step and always provide diff --git a/docs/setup.rst b/docs/setup.rst --- a/docs/setup.rst +++ b/docs/setup.rst @@ -36,7 +36,7 @@ up for you. setup process can be fully automated, example for lazy:: - paster setup-rhodecode production.ini --user=marcink --password=secret --email=marcin@rhodecode.org --repos=/home/marcink/my_repos + paster setup-rhodecode production.ini --user=nn --password=secret --email=nn@your.kallithea.server --repos=/home/nn/my_repos - The ``setup-rhodecode`` command will create all of the needed tables and an @@ -542,8 +542,8 @@ Sample config for nginx using proxy:: error_log /var/log/nginx/gist.error.log; ssl on; - ssl_certificate gist.rhodecode.myserver.com.crt; - ssl_certificate_key gist.rhodecode.myserver.com.key; + ssl_certificate gist.your.kallithea.server.crt; + ssl_certificate_key gist.your.kallithea.server.key; ssl_session_timeout 5m; @@ -551,19 +551,19 @@ Sample config for nginx using proxy:: ssl_ciphers DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:EDH-RSA-DES-CBC3-SHA:AES256-SHA:DES-CBC3-SHA:AES128-SHA:RC4-SHA:RC4-MD5; ssl_prefer_server_ciphers on; - rewrite ^/(.+)$ https://rhodecode.myserver.com/_admin/gists/$1; - rewrite (.*) https://rhodecode.myserver.com/_admin/gists; + rewrite ^/(.+)$ https://your.kallithea.server/_admin/gists/$1; + rewrite (.*) https://your.kallithea.server/_admin/gists; } server { listen 443; - server_name rhodecode.myserver.com; + server_name your.kallithea.server; access_log /var/log/nginx/rhodecode.access.log; error_log /var/log/nginx/rhodecode.error.log; ssl on; - ssl_certificate rhodecode.myserver.com.crt; - ssl_certificate_key rhodecode.myserver.com.key; + ssl_certificate your.kallithea.server.crt; + ssl_certificate_key your.kallithea.server.key; ssl_session_timeout 5m; diff --git a/production.ini b/production.ini --- a/production.ini +++ b/production.ini @@ -191,8 +191,8 @@ show_revision_number = true ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/. -## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/ +## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = ## white list of API enabled controllers. This allows to add list of diff --git a/rhodecode/bin/ldap_sync.conf b/rhodecode/bin/ldap_sync.conf --- a/rhodecode/bin/ldap_sync.conf +++ b/rhodecode/bin/ldap_sync.conf @@ -1,10 +1,10 @@ [default] -api_url = http://your.rhodecode.server:5000/_admin/api +api_url = http://your.kallithea.server:5000/_admin/api api_user = admin api_key = XXXXXXXXXXXX ldap_uri = ldap://your.ldap.server:389 -ldap_user = cn=rhodecode,ou=binders,dc=linaro,dc=org +ldap_user = cn=kallithea,ou=binders,dc=linaro,dc=org ldap_key = XXXXXXXXX base_dn = dc=linaro,dc=org diff --git a/rhodecode/bin/rhodecode_api.py b/rhodecode/bin/rhodecode_api.py --- a/rhodecode/bin/rhodecode_api.py +++ b/rhodecode/bin/rhodecode_api.py @@ -35,7 +35,7 @@ def argparser(argv): "rhodecode-api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] " "[--config=CONFIG] [--save-config] " "METHOD ...\n" - "Create config file: rhodecode-api --apikey= --apihost=http://rhodecode.server --save-config" + "Create config file: rhodecode-api --apikey= --apihost=http://your.kallithea.server --save-config" ) parser = argparse.ArgumentParser(description='RhodeCode API cli', diff --git a/rhodecode/bin/rhodecode_gist.py b/rhodecode/bin/rhodecode_gist.py --- a/rhodecode/bin/rhodecode_gist.py +++ b/rhodecode/bin/rhodecode_gist.py @@ -38,7 +38,7 @@ def argparser(argv): "rhodecode-gist [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] " "[--config=CONFIG] [--save-config] [GIST OPTIONS] " "[filename or stdin use - for terminal stdin ]\n" - "Create config file: rhodecode-gist --apikey= --apihost=http://rhodecode.server --save-config" + "Create config file: rhodecode-gist --apikey= --apihost=http://your.kallithea.server --save-config" ) parser = argparse.ArgumentParser(description='RhodeCode Gist cli', diff --git a/rhodecode/bin/template.ini.mako b/rhodecode/bin/template.ini.mako --- a/rhodecode/bin/template.ini.mako +++ b/rhodecode/bin/template.ini.mako @@ -200,8 +200,8 @@ show_revision_number = true <%text>## gist URL alias, used to create nicer urls for gist. This should be an <%text>## url that does rewrites to _admin/gists/. -<%text>## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -<%text>## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/ +<%text>## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +<%text>## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = <%text>## white list of API enabled controllers. This allows to add list of diff --git a/rhodecode/config/deployment.ini_tmpl b/rhodecode/config/deployment.ini_tmpl --- a/rhodecode/config/deployment.ini_tmpl +++ b/rhodecode/config/deployment.ini_tmpl @@ -191,8 +191,8 @@ show_revision_number = true ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/. -## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/ +## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/ gist_alias_url = ## white list of API enabled controllers. This allows to add list of