From ec7a8d81a65051503e9f27e142f29b187327959b Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 21 Dec 2015 15:52:15 -0800 Subject: [PATCH] Add functionality to disable the zack/r10k webhook Prior to this commit, if you upgraded from a previous version of the control-repo both code manager and zack/r10k webhook would be running and ready to receive data. This can present problems if the webhook isn't disbled in the git management system is sending data to both receivers. This commit adds rudimentary ability to break the zack/r10k webhook so it can't receive data. --- site/profile/manifests/git_webhook.pp | 1 + .../git_webhook/zack_r10k_webhook_disable.pp | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 site/profile/manifests/git_webhook/zack_r10k_webhook_disable.pp diff --git a/site/profile/manifests/git_webhook.pp b/site/profile/manifests/git_webhook.pp index a46d4ea..12ef786 100644 --- a/site/profile/manifests/git_webhook.pp +++ b/site/profile/manifests/git_webhook.pp @@ -6,6 +6,7 @@ class profile::git_webhook ( include profile::git_webhook::zack_r10k_webhook } else { include profile::git_webhook::code_manager + include profile::git_webhook::zack_r10k_webhook_disable } } diff --git a/site/profile/manifests/git_webhook/zack_r10k_webhook_disable.pp b/site/profile/manifests/git_webhook/zack_r10k_webhook_disable.pp new file mode 100644 index 0000000..ec54fc6 --- /dev/null +++ b/site/profile/manifests/git_webhook/zack_r10k_webhook_disable.pp @@ -0,0 +1,14 @@ +class profile::git_webhook::zack_r10k_webhook_disable { + + file { '/etc/webhook.yaml' : + ensure => absent, + notify => Exec['stop and disable webhook service'], + } + + exec { 'stop and disable webhook service' : + command => '/opt/puppetlabs/puppet/bin/puppet resource service webhook ensure=stopped enable=false', + logoutput => true, + refreshonly => true, + } + +}