diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-04 06:04:15 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-04 06:04:15 +0000 |
| commit | 456ba294ea9a6f18aae091d91129a1a5dfe0023c (patch) | |
| tree | e608365e73b99233ed7efed596c182a648bccb11 | |
| parent | ca425566d0266a1786019153757e283d7d246450 (diff) | |
| parent | 2e1217ea2d9ebe82f658509f62ee8ff5452523ee (diff) | |
| download | gitlab-shell-456ba294ea9a6f18aae091d91129a1a5dfe0023c.tar.gz | |
Merge branch 'working_gitlab_url' into 'master'
Use a default for gitlab_url that usually works
This default lets gitlab-shell connect to Unicorn directly, instead of
going through Nginx. This has the following benefits:
- the majority of users no longer has to edit the `gitlab_url`;
- avoid issues when the external GitLab web address does not resolve on
the GitLab server itself;
- avoid SSL certificate issues.
See merge request !32
| -rw-r--r-- | config.yml.example | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config.yml.example b/config.yml.example index 7ac6258..bc41c25 100644 --- a/config.yml.example +++ b/config.yml.example @@ -2,7 +2,11 @@ user: git # Url to gitlab instance. Used for api calls. Should end with a slash. -gitlab_url: "http://localhost/" +# Default: http://localhost:8080/ +# You only have to change the default if you have configured Unicorn +# to listen on a custom port, or if you have configured Unicorn to +# only listen on a Unix domain socket. +gitlab_url: "http://localhost:8080/" http_settings: # user: someone |
