summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Poignant <oliver@poignant.se>2016-11-29 21:14:03 +0100
committerOliver Poignant <oliver@poignant.se>2016-11-29 21:14:03 +0100
commit482781f0ffabf3ff77f8b30e73bec8103251ad86 (patch)
treef589b5cd57db2b1fe1702fd5039dd07032ef6db3
parent394954fc80230e01112166db4fe133c107febead (diff)
downloadGit-Auto-Deploy-482781f0ffabf3ff77f8b30e73bec8103251ad86.zip
Git-Auto-Deploy-482781f0ffabf3ff77f8b30e73bec8103251ad86.tar.gz
Git-Auto-Deploy-482781f0ffabf3ff77f8b30e73bec8103251ad86.tar.bz2
Modifying config option name and adding docs
-rw-r--r--docs/Configuration.md1
-rw-r--r--gitautodeploy/parsers/common.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/Configuration.md b/docs/Configuration.md
index c7248ca..24ce2ac 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -37,6 +37,7 @@ as follow:
Repository configurations are comprised of the following elements:
- **url**: The URL to the repository.
+ - **match-url**: An alternative URL used when matching incoming webhook requests (see https://github.com/olipo186/Git-Auto-Deploy/pull/148)
- **branch**: The branch which will be checked out.
- **remote**: The name of the remote to use.
- **path**: Path to clone the repository to. If omitted, the repository won't
diff --git a/gitautodeploy/parsers/common.py b/gitautodeploy/parsers/common.py
index e999a25..0a1a799 100644
--- a/gitautodeploy/parsers/common.py
+++ b/gitautodeploy/parsers/common.py
@@ -16,7 +16,7 @@ class WebhookRequestParser(object):
for repo_config in self._config['repositories']:
if repo_config in configs:
continue
- if repo_config.get('repo', repo_config.get('url')) == url:
+ if repo_config.get('match-url', repo_config.get('url')) == url:
configs.append(repo_config)
elif 'url_without_usernme' in repo_config and repo_config['url_without_usernme'] == url:
configs.append(repo_config)