Mercurial > kallithea
changeset 4182:05cabd91f7c3 kallithea-2.2.5-rebrand
Change example URL
author | Bradley M. Kuhn <bkuhn@sfconservancy.org> |
---|---|
date | Wed, 02 Jul 2014 19:03:53 -0400 |
parents | e5cb0a4e061a |
children | da3c57422ee6 |
files | development.ini docs/api/api.rst docs/setup.rst production.ini rhodecode/bin/ldap_sync.conf rhodecode/bin/rhodecode_api.py rhodecode/bin/rhodecode_gist.py rhodecode/bin/template.ini.mako rhodecode/config/deployment.ini_tmpl |
diffstat | 9 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/development.ini Wed Jul 02 19:03:47 2014 -0400 +++ b/development.ini Wed Jul 02 19:03:53 2014 -0400 @@ -191,8 +191,8 @@ ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/<gistid>. -## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid> +## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid> gist_alias_url = ## white list of API enabled controllers. This allows to add list of
--- a/docs/api/api.rst Wed Jul 02 19:03:47 2014 -0400 +++ b/docs/api/api.rst Wed Jul 02 19:03:53 2014 -0400 @@ -84,7 +84,7 @@ To get started quickly simply run:: - rhodecode-api _create_config --apikey=<youapikey> --apihost=<rhodecode host> + rhodecode-api _create_config --apikey=<youapikey> --apihost=<your.kallithea.server> 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
--- a/docs/setup.rst Wed Jul 02 19:03:47 2014 -0400 +++ b/docs/setup.rst Wed Jul 02 19:03:53 2014 -0400 @@ -36,7 +36,7 @@ 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 @@ 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 @@ 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;
--- a/production.ini Wed Jul 02 19:03:47 2014 -0400 +++ b/production.ini Wed Jul 02 19:03:53 2014 -0400 @@ -191,8 +191,8 @@ ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/<gistid>. -## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid> +## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid> gist_alias_url = ## white list of API enabled controllers. This allows to add list of
--- a/rhodecode/bin/ldap_sync.conf Wed Jul 02 19:03:47 2014 -0400 +++ b/rhodecode/bin/ldap_sync.conf Wed Jul 02 19:03:53 2014 -0400 @@ -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
--- a/rhodecode/bin/rhodecode_api.py Wed Jul 02 19:03:47 2014 -0400 +++ b/rhodecode/bin/rhodecode_api.py Wed Jul 02 19:03:53 2014 -0400 @@ -35,7 +35,7 @@ "rhodecode-api [-h] [--format=FORMAT] [--apikey=APIKEY] [--apihost=APIHOST] " "[--config=CONFIG] [--save-config] " "METHOD <key:val> <key2:val> ...\n" - "Create config file: rhodecode-api --apikey=<key> --apihost=http://rhodecode.server --save-config" + "Create config file: rhodecode-api --apikey=<key> --apihost=http://your.kallithea.server --save-config" ) parser = argparse.ArgumentParser(description='RhodeCode API cli',
--- a/rhodecode/bin/rhodecode_gist.py Wed Jul 02 19:03:47 2014 -0400 +++ b/rhodecode/bin/rhodecode_gist.py Wed Jul 02 19:03:53 2014 -0400 @@ -38,7 +38,7 @@ "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=<key> --apihost=http://rhodecode.server --save-config" + "Create config file: rhodecode-gist --apikey=<key> --apihost=http://your.kallithea.server --save-config" ) parser = argparse.ArgumentParser(description='RhodeCode Gist cli',
--- a/rhodecode/bin/template.ini.mako Wed Jul 02 19:03:47 2014 -0400 +++ b/rhodecode/bin/template.ini.mako Wed Jul 02 19:03:53 2014 -0400 @@ -200,8 +200,8 @@ <%text>## gist URL alias, used to create nicer urls for gist. This should be an</%text> <%text>## url that does rewrites to _admin/gists/<gistid>.</%text> -<%text>## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal</%text> -<%text>## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid></%text> +<%text>## example: http://gist.kallithea.server/{gistid}. Empty means use the internal</%text> +<%text>## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid></%text> gist_alias_url = <%text>## white list of API enabled controllers. This allows to add list of</%text>
--- a/rhodecode/config/deployment.ini_tmpl Wed Jul 02 19:03:47 2014 -0400 +++ b/rhodecode/config/deployment.ini_tmpl Wed Jul 02 19:03:53 2014 -0400 @@ -191,8 +191,8 @@ ## gist URL alias, used to create nicer urls for gist. This should be an ## url that does rewrites to _admin/gists/<gistid>. -## example: http://gist.rhodecode.org/{gistid}. Empty means use the internal -## RhodeCode url, ie. http[s]://rhodecode.server/_admin/gists/<gistid> +## example: http://gist.kallithea.server/{gistid}. Empty means use the internal +## RhodeCode url, ie. http[s]://your.kallithea.server/_admin/gists/<gistid> gist_alias_url = ## white list of API enabled controllers. This allows to add list of