diff options
| author | Job van der Voort <job@gitlab.com> | 2015-09-22 09:13:52 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-09-22 09:13:52 +0000 |
| commit | 0ce5fb71b609ebf74d95b4027b8eb91beafa3db4 (patch) | |
| tree | 07cb53ff891c19ba9f266326bf20e1848a746779 | |
| parent | 8ae026a6e64846d720184dbdee30d274a4e8ca24 (diff) | |
| parent | 531c208e62da1936a9f7ca30e6a88dd30a85c899 (diff) | |
| download | gitlab-ce-0ce5fb71b609ebf74d95b4027b8eb91beafa3db4.tar.gz | |
Merge branch 'webhooks' into 'master'
documentation on ssl verification in web hooks
See merge request !1386
| -rw-r--r-- | doc/web_hooks/ssl.png | bin | 0 -> 77165 bytes | |||
| -rw-r--r-- | doc/web_hooks/web_hooks.md | 18 |
2 files changed, 13 insertions, 5 deletions
diff --git a/doc/web_hooks/ssl.png b/doc/web_hooks/ssl.png Binary files differnew file mode 100644 index 00000000000..698f1a0f64a --- /dev/null +++ b/doc/web_hooks/ssl.png diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md index f4701bb6db2..c185ccfcac3 100644 --- a/doc/web_hooks/web_hooks.md +++ b/doc/web_hooks/web_hooks.md @@ -6,7 +6,15 @@ You can configure web hooks to listen for specific events like pushes, issues or Web hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server. -If you send a web hook to an SSL endpoint [the certificate will not be verified](https://gitlab.com/gitlab-org/gitlab-ce/blob/ccd617e58ea71c42b6b073e692447d0fe3c00be6/app/models/web_hook.rb#L35) since many people use self-signed certificates. +## SSL Verification + +By default, the SSL certificate of the webhook endpoint is verified based on +an internal list of Certificate Authorities, +which means the certificate cannot be self-signed. + +You can turn this off in the web hook settings in your GitLab projects. + + ## Push events @@ -34,7 +42,7 @@ X-Gitlab-Event: Push Hook "name": "Diaspora", "url": "git@example.com:mike/diasporadiaspora.git", "description": "", - "homepage": "http://example.com/mike/diaspora", + "homepage": "http://example.com/mike/diaspora", "git_http_url":"http://example.com/mike/diaspora.git", "git_ssh_url":"git@example.com:mike/diaspora.git", "visibility_level":0 @@ -513,8 +521,8 @@ server.mount_proc '/' do |req, res| puts req.body end -trap 'INT' do - server.shutdown +trap 'INT' do + server.shutdown end server.start ``` @@ -529,4 +537,4 @@ When you press 'Test Hook' in GitLab, you should see something like this in the {"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>} example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0 - -> / -``` +```
\ No newline at end of file |
