3
0

recommit for updates in build 56

This commit is contained in:
2025-02-26 21:14:30 +01:00
parent 415f6d7b99
commit 7ded8200e8
2 changed files with 475 additions and 7 deletions

View File

@@ -105,7 +105,43 @@
7 7
8 8
9 9
10</pre> 10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -114,6 +150,42 @@ class puppet_cd::main::files (
) inherits puppet_cd::params { ) inherits puppet_cd::params {
require puppet_cd::main::dirs require puppet_cd::main::dirs
if $fqdn != $pt_pm_fqdn {
file { $pt_puppet_conf_file:
ensure =&gt; file,
path =&gt; $pt_puppet_conf_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service],
}
}
if $fqdn == $pt_pm_fqdn {
file { $pt_puppet_conf_file:
ensure =&gt; file,
path =&gt; $pt_puppet_conf_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppet_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service],
}
}
if $pt_use_puppetdb == true {
file { $pt_puppetdb_conf_file:
ensure =&gt; filet,
path =&gt; $pt_puppetdb_conf_file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
content =&gt; template($pt_puppetdb_conf_erb),
notify =&gt; Service[$pt_agent_service,$pt_server_service],
}
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -881,6 +881,292 @@ considered a puppet agent.</p>
</li> </li>
<li>
<span class='name'>pt_logging_max_file_size</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;200MB&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_logging_max_history</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;90&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_logging_total_size</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1GB&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_com_proc_threads</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;4&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_concurrent_writes</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;4&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_db_subname</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;//localhost:5432/puppetdb&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_db_username</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;foobar&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_db_password</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;foobar&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_gc_interval</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;60&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_log_slow_statements</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_puppetdb_source_lan</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0/0&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_soft_write_failure</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
</li>
<li>
<span class='name'>pt_no_ssl_host</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_ssl_host</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0.0.0.0&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_ssl_key</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/ssl/private.pem&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_ssh_cert</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/ssl/public.pem&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_ssl_ca_cert</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/ssl/ca.pem&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_log_access</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
</li>
<li>
<span class='name'>pt_access_log_config</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/puppetlabs/puppetdb/request-logging.xml&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_enable_repl</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
</li>
<li>
<span class='name'>pt_repl_port</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;8082&#39;</tt>)</em>
</li>
<li>
<span class='name'>pt_repl_host</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;127.0.0.1&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -974,7 +1260,62 @@ considered a puppet agent.</p>
111 111
112 112
113 113
114</pre> 114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 32</span>
@@ -991,11 +1332,7 @@ class puppet_cd::params (
String $pt_agent_pkg = &#39;puppet-agent&#39;, String $pt_agent_pkg = &#39;puppet-agent&#39;,
String $pt_server_pkg = &#39;puppetserver&#39;, String $pt_server_pkg = &#39;puppetserver&#39;,
Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;], Array $pt_db_pkg = [&#39;puppetdb&#39;,&#39;puppetdb-termini&#39;],
# puppetdb
Boolean $pt_use_puppetdb = false,
String $pt_no_ssl_port = &#39;8080&#39;,
String $pt_ssl_port = &#39;8081&#39;,
Boolean $pt_use_ssl_only = true,
# user settings # user settings
## puppet user ## puppet user
Boolean $pt_manage_user = true, Boolean $pt_manage_user = true,
@@ -1010,6 +1347,7 @@ class puppet_cd::params (
String $pt_db_user_home = &#39;/opt/puppetlabs/server/data/puppetdb&#39;, String $pt_db_user_home = &#39;/opt/puppetlabs/server/data/puppetdb&#39;,
String $pt_db_user_shell = &#39;/sbin/nologin&#39;, String $pt_db_user_shell = &#39;/sbin/nologin&#39;,
# templates # templates
## puppet
String $pt_environment = &#39;production&#39;, String $pt_environment = &#39;production&#39;,
Boolean $pt_allow_duplicate_certs = false, Boolean $pt_allow_duplicate_certs = false,
String $pt_basemodulepath = &#39;/etc/puppetlabs/code/environments/common:/etc/puppetlabs/code/modules:/opt/puppetlabs/puppet/modules:/usr/share/puppet/modules&#39;, String $pt_basemodulepath = &#39;/etc/puppetlabs/code/environments/common:/etc/puppetlabs/code/modules:/opt/puppetlabs/puppet/modules:/usr/share/puppet/modules&#39;,
@@ -1037,11 +1375,39 @@ class puppet_cd::params (
Boolean $pt_storeconfigs = true, Boolean $pt_storeconfigs = true,
String $pt_storeconfigs_backend = &#39;puppetdb&#39;, String $pt_storeconfigs_backend = &#39;puppetdb&#39;,
String $pt_parser = &#39;current&#39;, String $pt_parser = &#39;current&#39;,
## puppetdb
Boolean $pt_use_puppetdb = false,
String $pt_logging_max_file_size = &#39;200MB&#39;,
String $pt_logging_max_history = &#39;90&#39;,
String $pt_logging_total_size = &#39;1GB&#39;,
String $pt_com_proc_threads = &#39;4&#39;,
String $pt_concurrent_writes = &#39;4&#39;,
String $pt_db_subname = &#39;//localhost:5432/puppetdb&#39;,
String $pt_db_username = &#39;foobar&#39;,
String $pt_db_password = &#39;foobar&#39;,
String $pt_gc_interval = &#39;60&#39;,
String $pt_log_slow_statements = &#39;10&#39;,
String $pt_no_ssl_port = &#39;8080&#39;,
String $pt_ssl_port = &#39;8081&#39;,
Boolean $pt_use_ssl_only = true,
String $pt_puppetdb_source_lan = &#39;0.0.0.0/0&#39;,
Boolean $pt_soft_write_failure = false,
String $pt_no_ssl_host = &#39;0.0.0.0&#39;,
String $pt_ssl_host = &#39;0.0.0.0&#39;,
String $pt_ssl_key = &#39;/etc/puppetlabs/puppetdb/ssl/private.pem&#39;,
String $pt_ssh_cert = &#39;/etc/puppetlabs/puppetdb/ssl/public.pem&#39;,
String $pt_ssl_ca_cert = &#39;/etc/puppetlabs/puppetdb/ssl/ca.pem&#39;,
Boolean $pt_log_access = false,
String $pt_access_log_config = &#39;/etc/puppetlabs/puppetdb/request-logging.xml&#39;,
Boolean $pt_enable_repl = false,
String $pt_repl_port = &#39;8082&#39;,
String $pt_repl_host = &#39;127.0.0.1&#39;,
) { ) {
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;] $fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
# directories # directories
## puppet
$pt_main_dir = &#39;/etc/puppetlabs&#39; $pt_main_dir = &#39;/etc/puppetlabs&#39;
$pt_puppetdir = &quot;${pt_main_dir}/puppet&quot; $pt_puppetdir = &quot;${pt_main_dir}/puppet&quot;
$pt_code_dir = &quot;${pt_main_dir}/code&quot; $pt_code_dir = &quot;${pt_main_dir}/code&quot;
@@ -1052,6 +1418,36 @@ class puppet_cd::params (
$pt_rundir_master = &#39;/var/run/puppetlabs/puppetserver&#39; $pt_rundir_master = &#39;/var/run/puppetlabs/puppetserver&#39;
$pt_vardir = &#39;/opt/puppetlabs/puppet/cache&#39; $pt_vardir = &#39;/opt/puppetlabs/puppet/cache&#39;
$pt_vardir_master = &#39;/opt/puppetlabs/server/data/puppetserver&#39; $pt_vardir_master = &#39;/opt/puppetlabs/server/data/puppetserver&#39;
## puppetdb
$pt_puppetdb_main = &#39;/etc/puppetlabs/puppetdb&#39;
$pt_puppetdb_conf_d = &quot;${pt_puppetdb_main}/conf.d&quot;
$pt_puppetdb_ssl = &quot;${pt_puppetdb_main}/ssl&quot;
$pt_puppetdb_log = &#39;/var/log/puppetlabs/puppetdb&#39;
$pt_puppetdb_var_dir = &#39;/opt/puppetlabs/server/data/puppetdb&#39;
# files
## puppet
$pt_puppet_conf_file = &quot;${pt_puppetdir}/puppet.conf&quot;
$pt_puppet_conf_erb = &#39;puppet_cd/puppet.conf.erb&#39;
$pt_hiera_config = &quot;${pt_puppetdir}/hiera.yaml&quot;
## puppetdb
$pt_bootstrap_conf = &quot;${pt_puppetdb_main}/bootstrap.cfg&quot;
$pt_bootstrap_erb = &#39;cd_puppet/puppetdb/bootstrap.cfg.erb&#39;
$pt_puppetdb_access_log = &quot;${pt_puppetdb_log}/puppetdb-access&quot;
$pt_request_logging_conf = &quot;${pt_puppetdb_main}/request-logging.xml&quot;
$pt_request_logging_erb = &#39;cd_puppet/puppetdb/request_logging.xml.erb&#39;
$pt_logback_conf = &quot;${pt_puppetdb_main}/logback.xml&quot;
$pt_logback_erb = &#39;cd_puppet/puppetdb/logback.xml.erb&#39;
$pt_puppetdb_config_ini = &quot;${pt_puppetdb_conf_d}/config.ini&quot;
$pt_puppetdb_config_erb = &#39;cd_puppet/puppetdb/config.ini.erb&#39;
$pt_puppetdb_database_ini = &quot;${pt_puppetdb_conf_d}/database.ini&quot;
$pt_puppetdb_database_erb = &#39;cd_puppet/puppetdb/database.ini.erb&#39;
$pt_puppetdb_jetty_ini = &quot;${pt_puppetdb_conf_d}/jetty.ini&quot;
$pt_puppetdb_jetty_erb = &#39;cd_puppet/puppetdb/jetty.ini.erb&#39;
$pt_puppetdb_conf_file = &quot;${pt_puppetdir}/puppetdb.conf&quot;
$pt_puppetdb_conf_erb = &#39;cd_puppet/puppetdb/puppetdb.conf.erb&#39;
$pt_puppetdb_repl_ini = &quot;${pt_puppetdb_conf_d}/repl.ini&quot;
$pt_puppetdb_repl_erb = &#39;cd_puppet/puppetdb/repl.ini.erb&#39;
# service # service
$pt_server_service = &#39;puppetserver&#39; $pt_server_service = &#39;puppetserver&#39;