Recommit for updates in build 57
This commit is contained in:
@@ -73,11 +73,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span>
|
||||
|
||||
@@ -103,11 +98,6 @@
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
|
||||
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>
|
||||
|
||||
|
||||
@@ -43,55 +43,41 @@
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::firewall::iptables" class="even">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::puppet_cd::firewall::iptables (puppet_class)">puppet_cd::firewall::iptables</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::main::config" class="odd">
|
||||
<li id="object_puppet_classes::puppet_cd::main::config" class="even">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::puppet_cd::main::config (puppet_class)">puppet_cd::main::config</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::main::dirs" class="even">
|
||||
<li id="object_puppet_classes::puppet_cd::main::dirs" class="odd">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Adirs.html" title="puppet_classes::puppet_cd::main::dirs (puppet_class)">puppet_cd::main::dirs</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::main::files" class="odd">
|
||||
<li id="object_puppet_classes::puppet_cd::main::files" class="even">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Afiles.html" title="puppet_classes::puppet_cd::main::files (puppet_class)">puppet_cd::main::files</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::main::install" class="even">
|
||||
<li id="object_puppet_classes::puppet_cd::main::install" class="odd">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::puppet_cd::main::install (puppet_class)">puppet_cd::main::install</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::main::user" class="odd">
|
||||
<li id="object_puppet_classes::puppet_cd::main::user" class="even">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Amain_3A_3Auser.html" title="puppet_classes::puppet_cd::main::user (puppet_class)">puppet_cd::main::user</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::params" class="even">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
|
||||
<li id="object_puppet_classes::puppet_cd::puppetdb::dirs" class="odd">
|
||||
<div class="item">
|
||||
<span class='object_link'><a href="puppet_classes/puppet_cd_3A_3Apuppetdb_3A_3Adirs.html" title="puppet_classes::puppet_cd::puppetdb::dirs (puppet_class)">puppet_cd::puppetdb::dirs</a></span>
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
@@ -164,7 +164,29 @@
|
||||
66
|
||||
67
|
||||
68
|
||||
69</pre>
|
||||
69
|
||||
70
|
||||
71
|
||||
72
|
||||
73
|
||||
74
|
||||
75
|
||||
76
|
||||
77
|
||||
78
|
||||
79
|
||||
80
|
||||
81
|
||||
82
|
||||
83
|
||||
84
|
||||
85
|
||||
86
|
||||
87
|
||||
88
|
||||
89
|
||||
90
|
||||
91</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/r10k/install.pp', line 6</span>
|
||||
@@ -191,6 +213,7 @@ class puppet_cd::r10k::install (
|
||||
package { 'r10k':
|
||||
ensure => $pt_pkg_ensure,
|
||||
provider => gem,
|
||||
require => Package[$pt_r10k_pkg],
|
||||
}
|
||||
|
||||
# create r10k dir
|
||||
@@ -219,16 +242,37 @@ class puppet_cd::r10k::install (
|
||||
require => File['r10k_dir'],
|
||||
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 => present,
|
||||
provider => gem,
|
||||
require => Package[$pt_r10k_pkg],
|
||||
}
|
||||
|
||||
exec { 'install rpm':
|
||||
command => "yum install -y ${pt_r10k_webhook_pkg}",
|
||||
unless => 'rpm -qa | grep webhook-go',
|
||||
require => File[$pt_r10k_webhook_pkg],
|
||||
exec { 'create symlink':
|
||||
command => $pt_webhook_link,
|
||||
creates => '/usr/bin/r10k_gitlab_webhook',
|
||||
path => ['/bin', '/usr/bin'],
|
||||
require => Package[$pt_r10k_webhook_pkg],
|
||||
}
|
||||
|
||||
file { $pt_webhook_service_file:
|
||||
ensure => file,
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0664',
|
||||
selrange => s0,
|
||||
selrole => object_r,
|
||||
seltype => puppet_etc_t,
|
||||
seluser => unconfined_u,
|
||||
content => template($pt_webhook_service_erb),
|
||||
notify => [Service[$pt_r10k_webhook_service],Exec['systemctl-daemon-reload']],
|
||||
}
|
||||
|
||||
exec { 'systemctl-daemon-reload':
|
||||
command => '/bin/systemctl daemon-reload',
|
||||
refreshonly => true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
<dl>
|
||||
<dt>Inherits:</dt>
|
||||
<dd><span class='object_link'><a href="puppet_cd_3A_3Aparams.html" title="puppet_classes::puppet_cd::params (puppet_class)">puppet_cd::params</a></span></dd>
|
||||
<dd>puppet_cd::params</dd>
|
||||
</dl>
|
||||
|
||||
|
||||
@@ -149,8 +149,7 @@
|
||||
51
|
||||
52
|
||||
53
|
||||
54
|
||||
55</pre>
|
||||
54</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/server/service.pp', line 6</span>
|
||||
@@ -196,8 +195,7 @@ class puppet_cd::server::service (
|
||||
# manage webhook service
|
||||
if $pt_use_r10k_webhook == true {
|
||||
require puppet_cd::r10k::install
|
||||
|
||||
service { $pt_webhook_service:
|
||||
service { $pt_r10k_webhook_service:
|
||||
ensure => running,
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
|
||||
Reference in New Issue
Block a user