recommit for updates in build 60
This commit is contained in:
@@ -105,9 +105,7 @@
|
||||
7
|
||||
8
|
||||
9
|
||||
10
|
||||
11
|
||||
12</pre>
|
||||
10</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
|
||||
@@ -115,9 +113,7 @@
|
||||
class puppet_cd::main::config (
|
||||
|
||||
) inherits puppet_cd::params {
|
||||
if $fqdn == $pt_pm_fqdn {
|
||||
include puppet_cd::server::service
|
||||
}
|
||||
include puppet_cd::server::service
|
||||
}</pre>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -141,7 +141,8 @@
|
||||
43
|
||||
44
|
||||
45
|
||||
46</pre>
|
||||
46
|
||||
47</pre>
|
||||
</td>
|
||||
<td>
|
||||
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
|
||||
@@ -158,7 +159,7 @@ class puppet_cd::main::files (
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
content => template($pt_agent_conf_erb),
|
||||
content => template($pt_puppet_conf_erb),
|
||||
notify => Service[$pt_agent_service],
|
||||
}
|
||||
}
|
||||
@@ -176,6 +177,7 @@ class puppet_cd::main::files (
|
||||
}
|
||||
|
||||
if $pt_use_puppetdb == true {
|
||||
|
||||
file { $pt_puppetdb_conf_file:
|
||||
ensure => filet,
|
||||
path => $pt_puppetdb_conf_file,
|
||||
|
||||
Reference in New Issue
Block a user