Compare commits

..

5 Commits

Author SHA1 Message Date
Jenkins Server
a1a96069e9 Recommit for updates in build 30 2026-10-04 12:20:56 +02:00
Jenkins Server
09f8a1b1bd Merge remote-tracking branch 'origin/master' into jenkins-build-30 2026-10-04 12:19:55 +02:00
16597c16d5 OP#830 add logrotation file 2026-10-04 12:19:36 +02:00
ceabad8b19 OP#830 add drift file 2026-10-04 12:09:10 +02:00
Jenkins Server
47dc39eb4b Recommit for updates in build 29 2026-10-04 11:59:13 +02:00
5 changed files with 83 additions and 2 deletions

View File

@@ -123,7 +123,28 @@
25 25
26 26
27 27
28</pre> 28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49</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>
@@ -148,8 +169,29 @@ class confdroid_ntp::main::files (
} }
# drift file /var/lib/chrony/drift # drift file /var/lib/chrony/drift
file { $cy_drift_file:
ensure =&gt; file,
owner =&gt; &#39;chrony&#39;,
group =&gt; &#39;chrony&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; chronyd_var_lib_t,
seluser =&gt; system_u,
}
# log rotation # log rotation
file { $cy_logrotate_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; etc_t,
seluser =&gt; system_u,
content =&gt; template($cy_logrotate_erb),
}
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -333,7 +333,10 @@
53 53
54 54
55 55
56</pre> 56
57
58
59</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span>
@@ -366,6 +369,9 @@ class confdroid_ntp::params (
# files # files
$cy_conf_file = &#39;/etc/chrony.conf&#39; $cy_conf_file = &#39;/etc/chrony.conf&#39;
$cy_conf_erb = &#39;confdroid_ntp/chrony.conf.erb&#39; $cy_conf_erb = &#39;confdroid_ntp/chrony.conf.erb&#39;
$cy_drift_file = &#39;/var/lib/chrony/drift&#39;
$cy_logrotate_file = &#39;/etc/logrotate.d/chrony&#39;
$cy_logrotate_erb = &#39;confdroid_ntp/logrotate.chrony.erb&#39;
# service # service
$cy_service = &#39;chronyd&#39; $cy_service = &#39;chronyd&#39;

View File

@@ -23,6 +23,27 @@ class confdroid_ntp::main::files (
} }
# drift file /var/lib/chrony/drift # drift file /var/lib/chrony/drift
file { $cy_drift_file:
ensure => file,
owner => 'chrony',
group => 'chrony',
mode => '0644',
selrange => s0,
selrole => object_r,
seltype => chronyd_var_lib_t,
seluser => system_u,
}
# log rotation # log rotation
file { $cy_logrotate_file:
ensure => file,
owner => 'root',
group => 'root',
mode => '0644',
selrange => s0,
selrole => object_r,
seltype => etc_t,
seluser => system_u,
content => template($cy_logrotate_erb),
}
} }

View File

@@ -47,6 +47,9 @@ class confdroid_ntp::params (
# files # files
$cy_conf_file = '/etc/chrony.conf' $cy_conf_file = '/etc/chrony.conf'
$cy_conf_erb = 'confdroid_ntp/chrony.conf.erb' $cy_conf_erb = 'confdroid_ntp/chrony.conf.erb'
$cy_drift_file = '/var/lib/chrony/drift'
$cy_logrotate_file = '/etc/logrotate.d/chrony'
$cy_logrotate_erb = 'confdroid_ntp/logrotate.chrony.erb'
# service # service
$cy_service = 'chronyd' $cy_service = 'chronyd'

View File

@@ -0,0 +1,9 @@
# file created by Puppet, manual changes will be overwritten
/var/log/chrony/*.log {
missingok
nocreate
sharedscripts
postrotate
/usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true
endscript
}