Recommit for updates in build 24

README.md

@@ -34,7 +34,7 @@ This module differentiates between client- and server configuration. If the `FQD
 
 If you have no local time server(s), leave  `cy_use_lan_server` at `false` (default), else set it to `true`. This affects only client configurations.
 
-The value for `cy_server_fqdn` is a string rather array, assuming either a single time server or a round-robin DNS CNAME entry returning several values for the time server (not configured by this module).
+The value for `cy_server_fqdn` is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).
 
 INSTALLATION
 

doc/file.README.html

@@ -107,7 +107,7 @@
 
 <p>If you have no local time server(s), leave <code>cy_use_lan_server</code> at <code>false</code> (default), else set it to <code>true</code>. This affects only client configurations.</p>
 
-<p>The value for <code>cy_server_fqdn</code> is a string rather array, assuming either a single time server or a round-robin DNS CNAME entry returning several values for the time server (not configured by this module).</p>
+<p>The value for <code>cy_server_fqdn</code> is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).</p>
 
 <p>INSTALLATION</p>
 <ul><li>

doc/index.html

@@ -107,7 +107,7 @@
 
 <p>If you have no local time server(s), leave <code>cy_use_lan_server</code> at <code>false</code> (default), else set it to <code>true</code>. This affects only client configurations.</p>
 
-<p>The value for <code>cy_server_fqdn</code> is a string rather array, assuming either a single time server or a round-robin DNS CNAME entry returning several values for the time server (not configured by this module).</p>
+<p>The value for <code>cy_server_fqdn</code> is a string rather array, assuming either a single time server or a round-robin DNS entry for this, returning several values for the time server (not configured by this module).</p>
 
 <p>INSTALLATION</p>
 <ul><li>

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Adirs.html

@@ -109,27 +109,7 @@
 11
 12
 13
-14
+14</pre>
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/dirs.pp', line 6</span>
@@ -140,28 +120,8 @@ class confdroid_ntp::main::dirs (
   require confdroid_ntp::main::install
 
   # /var/log/chrony
-  file { &#39;/var/log/chrony&#39;:
-    ensure   =&gt; directory,
-    owner    =&gt; &#39;chrony&#39;,
-    group    =&gt; &#39;chrony&#39;,
-    mode     =&gt; &#39;0750&#39;,
-    selrange =&gt; s0,
-    selrole  =&gt; object_r,
-    seltype  =&gt; chrony_var_log_t,
-    seluser  =&gt; system_u,
-  }
 
   # /var/lib/chrony
-  file { &#39;/var/lib/chrony&#39;:
-    ensure   =&gt; directory,
-    owner    =&gt; &#39;chrony&#39;,
-    group    =&gt; &#39;chrony&#39;,
-    mode     =&gt; &#39;0750&#39;,
-    selrange =&gt; s0,
-    selrole  =&gt; object_r,
-    seltype  =&gt; chrony_var_lib_t,
-    seluser  =&gt; system_u,
-  }
 }</pre>
       </td>
     </tr>

manifests/main/dirs.pp

@@ -9,26 +9,6 @@ class confdroid_ntp::main::dirs (
   require confdroid_ntp::main::install
 
   # /var/log/chrony
-  file { '/var/log/chrony':
-    ensure   => directory,
-    owner    => 'chrony',
-    group    => 'chrony',
-    mode     => '0750',
-    selrange => s0,
-    selrole  => object_r,
-    seltype  => chrony_var_log_t,
-    seluser  => system_u,
-  }
 
   # /var/lib/chrony
-  file { '/var/lib/chrony':
-    ensure   => directory,
-    owner    => 'chrony',
-    group    => 'chrony',
-    mode     => '0750',
-    selrange => s0,
-    selrole  => object_r,
-    seltype  => chrony_var_lib_t,
-    seluser  => system_u,
-  }
 }

templates/chrony.conf.erb

@@ -57,6 +57,7 @@ logdir /var/log/chrony
 
 # Select which information is logged.
 log <%= @cy_loginfo %>
+
 <% end %>
 
 
@@ -116,4 +117,5 @@ logdir /var/log/chrony
 
 # Select which information is logged.
 log <%= @cy_loginfo %>
+
 <% end %>