diff --git a/doc/_index.html b/doc/_index.html
index 9ec1e15..8ba9463 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -98,6 +98,11 @@
+
+ puppet_cd::params
+
+
+
puppet_cd::puppetdb::dirs
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index 5cdd80e..aac321c 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -78,35 +78,42 @@
-
+
+
+
+
+
+
-
+
-
+
-
+
-
+
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
index be28782..52770d4 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
index ac7901f..2f6fb4d 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
index 1f5d6e1..9491674 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
index ddfa784..292829a 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
index 82be101..94ec425 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aparams.html b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
index a7b74eb..d79ea88 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aparams.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aparams.html
@@ -87,8 +87,6 @@
puppet_cd::puppetdb::service
- puppet_cd::firewall::iptables
-
@@ -252,7 +250,7 @@
(Array)
- (defaults to: ['ruby','ruby-devel','gcc','make','redhat-rpm-config','rpm-build'])
+ (defaults to: ['ruby','ruby-devel','rubygems','gcc','make'])
—
@@ -1473,10 +1471,10 @@
pt_r10k_webhook_pkg
- (String)
+ (Array)
- (defaults to: '/tmp/webhook-go.rpm')
+ (defaults to: ['webrick', 'r10k_gitlab_webhook'])
—
@@ -1500,6 +1498,24 @@
—
whether to manage the puppet user
+
+
+
+
+
+
+ pt_r10k_webhook_port
+
+
+ (String)
+
+
+ (defaults to: '8080')
+
+
+ —
+
+
the port for the webhook listener
@@ -1515,7 +1531,6 @@
-88
89
90
91
@@ -1672,10 +1687,15 @@
242
243
244
-245
+245
+246
+247
+248
+249
+250
- # File 'manifests/params.pp', line 88
+ # File 'manifests/params.pp', line 89
class puppet_cd::params (
@@ -1688,8 +1708,8 @@ class puppet_cd::params (
String $pt_agent_pkg = 'puppet-agent',
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 = '/tmp/webhook-go.rpm',
+ Array $pt_r10k_pkg = ['ruby','ruby-devel','rubygems','gcc','make'],
+ Array $pt_r10k_webhook_pkg = ['webrick', 'r10k_gitlab_webhook'],
# user settings
## puppet user
@@ -1767,6 +1787,7 @@ class puppet_cd::params (
String $pt_r10k_remote = 'git@gitlab.example.net/repo.git',
Boolean $pt_r10k_prefix = false,
String $pt_r10k_basedir = '/etc/puppetlabs/code/environments',
+ String $pt_r10k_webhook_port = '8080',
) {
# facts
@@ -1824,12 +1845,15 @@ class puppet_cd::params (
## r10k
$pt_r10k_file = "${pt_r10k_dir}/r10k.yaml"
$pt_r10k_erb = 'puppet_cd/r10k/r10k.yaml.erb'
+ $pt_webhook_link = 'ln -sf /usr/local/share/gems/gems/r10k_gitlab_webhook-0.1.3/bin/r10k_gitlab_webhook /usr/bin/'
+ $pt_webhook_service_file = '/etc/systemd/system/r10k_gitlab_webhook.service'
+ $pt_webhook_service_erb = 'puppet_cd/r10k/r10k_webhook_service.erb'
# service
$pt_server_service = 'puppetserver'
$pt_agent_service = 'puppet'
$pt_db_service = 'puppetdb'
- $pt_webhook_service = 'webhook-go.service'
+ $pt_r10k_webhook_service = 'r10k_gitlab_webhook'
#
# includes must be last
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
index 70e2765..b0c25f1 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
index 0ee5134..5f82142 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Afiles.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
index 77e9942..70af012 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Aservice.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
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 c45414b..2d7b1b7 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Ar10k_3A_3Ainstall.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
index 0ae173d..c7784be 100644
--- a/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
+++ b/doc/puppet_classes/puppet_cd_3A_3Aserver_3A_3Aservice.html
@@ -64,7 +64,7 @@
- Inherits:
- - puppet_cd::params
+ - puppet_cd::params
diff --git a/manifests/params.pp b/manifests/params.pp
index a5e41e4..e50e3d5 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -176,7 +176,7 @@ class puppet_cd::params (
String $pt_r10k_remote = 'git@gitlab.example.net/repo.git',
Boolean $pt_r10k_prefix = false,
String $pt_r10k_basedir = '/etc/puppetlabs/code/environments',
- String $pt_r10k_webhook_port = '8080'.
+ String $pt_r10k_webhook_port = '8080',
) {
# facts
|