diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html index 20ffb7e..a7b74eb 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html +++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html @@ -1476,7 +1476,7 @@ (String) - (defaults to: 'https://3for.me/jp029') + (defaults to: '/tmp/webhook-go.rpm') — @@ -1689,7 +1689,7 @@ class puppet_cd::params ( String $pt_server_pkg = 'puppetserver', Array $pt_db_pkg = ['puppetdb','puppetdb-termini'], Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'], - String $pt_r10k_webhook_pkg = 'https://3for.me/jp029', # points to rpm + String $pt_r10k_webhook_pkg = '/tmp/webhook-go.rpm', # user settings ## puppet user diff --git a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html index c6d0c53..1f77e8b 100644 --- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html +++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html @@ -157,7 +157,13 @@ 59 60 61 -62 +62 +63 +64 +65 +66 +67 +68
# File 'manifests/r10k/install.pp', line 6
@@ -213,8 +219,14 @@ class puppet_cd::r10k::install (
content => template($pt_r10k_erb),
}
if $pt_use_r10k_webhook == true {
+ file { $pt_r10k_webhook_pkg:
+ ensure => file,
+ source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
+ }
+
package { $pt_r10k_webhook_pkg:
ensure => $pt_pkg_ensure,
+ require => File[$pt_r10k_webhook_pkg]
}
}
}
diff --git a/files/webhook b/files/webhook
deleted file mode 100644
index 024455b..0000000
Binary files a/files/webhook and /dev/null differ
diff --git a/files/webhook-go.rpm b/files/webhook-go.rpm
new file mode 100644
index 0000000..6697a58
Binary files /dev/null and b/files/webhook-go.rpm differ
diff --git a/manifests/params.pp b/manifests/params.pp
index cf0a390..af23adc 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -97,7 +97,7 @@ class puppet_cd::params (
String $pt_server_pkg = 'puppetserver',
Array $pt_db_pkg = ['puppetdb','puppetdb-termini'],
Array $pt_r10k_pkg = ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'],
- String $pt_r10k_webhook_pkg = 'https://3for.me/jp029', # points to rpm
+ String $pt_r10k_webhook_pkg = '/tmp/webhook-go.rpm',
# user settings
## puppet user
diff --git a/manifests/r10k/install.pp b/manifests/r10k/install.pp
index 27c832b..3302867 100644
--- a/manifests/r10k/install.pp
+++ b/manifests/r10k/install.pp
@@ -54,8 +54,14 @@ class puppet_cd::r10k::install (
content => template($pt_r10k_erb),
}
if $pt_use_r10k_webhook == true {
+ file { $pt_r10k_webhook_pkg:
+ ensure => file,
+ source => 'puppet:///modules/puppet_cd/webhook-go.rpm'
+ }
+
package { $pt_r10k_webhook_pkg:
ensure => $pt_pkg_ensure,
+ require => File[$pt_r10k_webhook_pkg]
}
}
}