diff --git a/README.md b/README.md index af3a1f2..1e16bb3 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ If you don't have time to waste configuring, hosting, debugging and maintaining # -hookdeck If you need a way of inspecting, monitoring and replaying webhooks without the back and forth troubleshooting, [give Hookdeck a try!](https://www.hookdeck.io/?ref=adnanh-webhook) +hookdeck If you need a way of inspecting, monitoring and replaying webhooks without the back and forth troubleshooting, [give Hookdeck a try!](https://www.hookdeck.com/?ref=adnanh-webhook) # Getting started ## Installation @@ -123,7 +123,7 @@ Check out [Hook examples page](docs/Hook-Examples.md) for more complex examples ### Guides featuring webhook - [Plex 2 Telegram](https://gitlab.com/-/snippets/1972594) by [@psyhomb](https://github.com/psyhomb) - - [Webhook & JIRA](https://sites.google.com/site/mrxpalmeiras/notes/jira-webhooks) by [@perfecto25](https://github.com/perfecto25) + - [Webhook & JIRA](https://sites.google.com/site/mrxpalmeiras/more/jira-webhooks) by [@perfecto25](https://github.com/perfecto25) - [Trigger Ansible AWX job runs on SCM (e.g. git) commit](http://jpmens.net/2017/10/23/trigger-awx-job-runs-on-scm-commit/) by [@jpmens](http://mens.de/) - [Deploy using GitHub webhooks](https://davidauthier.wearemd.com/blog/deploy-using-github-webhooks.html) by [@awea](https://davidauthier.wearemd.com) - [Setting up Automatic Deployment and Builds Using Webhooks](https://willbrowning.me/setting-up-automatic-deployment-and-builds-using-webhooks/) by [Will Browning](https://willbrowning.me/about/) @@ -138,6 +138,8 @@ Check out [Hook examples page](docs/Hook-Examples.md) for more complex examples - [XiaoMi Vacuum + Amazon Button = Dash Cleaning](https://www.instructables.com/id/XiaoMi-Vacuum-Amazon-Button-Dash-Cleaning/) by [c0mmensal](https://www.instructables.com/member/c0mmensal/) - [Set up Automated Deployments From Github With Webhook](https://maximorlov.com/automated-deployments-from-github-with-webhook/) by [Maxim Orlov](https://twitter.com/_maximization) - VIDEO: [Gitlab CI/CD configuration using Docker and adnanh/webhook to deploy on VPS - Tutorial #1](https://www.youtube.com/watch?v=Qhn-lXjyrZA&feature=youtu.be) by [Yes! Let's Learn Software Engineering](https://www.youtube.com/channel/UCH4XJf2BZ_52fbf8fOBMF3w) + - [Integrate automatic deployment in 20 minutes using webhooks + Nginx setup](https://anksus.me/blog/integrate-automatic-deployment-in-20-minutes-using-webhooks) by [Anksus](https://github.com/Anksus) + - [Automatically redeploy your static blog with Gitea, Uberspace & Webhook](https://by.arran.nz/posts/code/webhook-deploy/) by [Arran](https://arran.nz) - ... - Want to add your own? Open an Issue or create a PR :-) diff --git a/docs/Hook-Examples.md b/docs/Hook-Examples.md index 36e4ddc..05f9a23 100644 --- a/docs/Hook-Examples.md +++ b/docs/Hook-Examples.md @@ -23,6 +23,9 @@ although the examples on this page all use the JSON format. * [Pass string arguments to command](#pass-string-arguments-to-command) ## Incoming Github webhook + +This example works on 2.8+ versions of Webhook - if you are on a previous series, change `payload-hmac-sha1` to `payload-hash-sha1`. + ```json [ { @@ -80,7 +83,7 @@ although the examples on this page all use the JSON format. ## Incoming Bitbucket webhook -Bitbucket does not pass any secrets back to the webhook. [Per their documentation](https://confluence.atlassian.com/bitbucket/manage-webhooks-735643732.html#Managewebhooks-trigger_webhookTriggeringwebhooks), in order to verify that the webhook came from Bitbucket you must whitelist the IP range `104.192.143.0/24`: +Bitbucket does not pass any secrets back to the webhook. [Per their documentation](https://support.atlassian.com/organization-administration/docs/ip-addresses-and-domains-for-atlassian-cloud-products/#Outgoing-Connections), in order to verify that the webhook came from Bitbucket you must whitelist a set of IP ranges: ```json [ @@ -97,11 +100,23 @@ Bitbucket does not pass any secrets back to the webhook. [Per their documentati ], "trigger-rule": { - "match": - { - "type": "ip-whitelist", - "ip-range": "104.192.143.0/24" - } + "or": + [ + { "match": { "type": "ip-whitelist", "ip-range": "13.52.5.96/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "13.236.8.224/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "18.136.214.96/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "18.184.99.224/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "18.234.32.224/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "18.246.31.224/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "52.215.192.224/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "104.192.137.240/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "104.192.138.240/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "104.192.140.240/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "104.192.142.240/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "104.192.143.240/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "185.166.143.240/28" } }, + { "match": { "type": "ip-whitelist", "ip-range": "185.166.142.240/28" } } + ] } } ] @@ -309,7 +324,7 @@ __Not recommended in production due to low security__ ``` ## JIRA Webhooks -[Guide by @perfecto25](https://sites.google.com/site/mrxpalmeiras/notes/jira-webhooks) +[Guide by @perfecto25](https://sites.google.com/site/mrxpalmeiras/more/jira-webhooks) ## Pass File-to-command sample