Skip to content

Commit

Permalink
Merge pull request #123 from WhatsARanjit/bindaddress
Browse files Browse the repository at this point in the history
Added bind_address option to webhook.yaml
  • Loading branch information
acidprime committed Feb 10, 2015
2 parents 58c067a + f37de16 commit 6865ffe
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions files/webhook
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public_key_path = File.join("#{$config['certpath']}", "#{$config['certname']}-c
private_key_path = File.join("#{$config['certpath']}", "#{$config['certname']}-private.pem")

opts = {
:Host => $config['bind_address'],
:Port => $config['port'],
:Logger => $logger,
:ServerType => WEBrick::Daemon,
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
# Webhook configuration information
$webhook_user = 'puppet'
$webhook_pass = 'puppet'
$webhook_bind_address = $::ipaddress
$webhook_port = '8088'
$webhook_access_logfile = '/var/log/webhook/access.log'
$webhook_mco_logfile = '/var/log/webhook/mco_output.log'
Expand Down
2 changes: 2 additions & 0 deletions manifests/webhook/config.pp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
$certpath = $r10k::params::webhook_certpath,
$user = $r10k::params::webhook_user,
$pass = $r10k::params::webhook_pass,
$bind_address = $r10k::params::webhook_bind_address,
$port = $r10k::params::webhook_port,
$access_logfile = $r10k::params::webhook_access_logfile,
$mco_logfile = $r10k::params::webhook_mco_logfile,
Expand All @@ -30,6 +31,7 @@
$webhook_hash = {
'user' => $user,
'pass' => $pass,
'bind_address' => $bind_address,
'port' => $port,
'certname' => $certname,
'client_timeout' => $client_timeout,
Expand Down

0 comments on commit 6865ffe

Please sign in to comment.