Recommit for updates in build 29

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Afiles.html

@@ -123,28 +123,7 @@
 25
 26
 27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49</pre>
+28</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -169,29 +148,8 @@ class confdroid_ntp::main::files (
   }
 
   # 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
-  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>
       </td>
     </tr>

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -333,10 +333,7 @@
 53
 54
 55
-56
-57
-58
-59</pre>
+56</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span>
@@ -369,9 +366,6 @@ class confdroid_ntp::params (
 # files
   $cy_conf_file               = &#39;/etc/chrony.conf&#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
   $cy_service                 = &#39;chronyd&#39;

manifests/main/files.pp

@@ -23,27 +23,6 @@ class confdroid_ntp::main::files (
   }
 
   # 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
-  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),
-  }
 }

manifests/params.pp

@@ -47,9 +47,6 @@ class confdroid_ntp::params (
 # files
   $cy_conf_file               = '/etc/chrony.conf'
   $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
   $cy_service                 = 'chronyd'

templates/logrotate.chrony.erb

@@ -1,9 +0,0 @@
-# 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
-}