Recommit for updates in build 22

README.md

@@ -32,7 +32,7 @@ Time management in Linux is important. The underlying protocol is ntp, the servi
 
 This module differentiates between client- and server configuration. If the `FQDN` of the puppet client matches the value of `cy_server_fqdn`, it assumes this to be an ntp time server, else it will be a client.
 
-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.
+If you have no local time server(s), leave the default for `cy_server_fqdn`.
 
 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).
 

doc/file.README.html

@@ -105,7 +105,7 @@
 
 <p>This module differentiates between client- and server configuration. If the <code>FQDN</code> of the puppet client matches the value of <code>cy_server_fqdn</code>, it assumes this to be an ntp time server, else it will be a client.</p>
 
-<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>If you have no local time server(s), leave the default for <code>cy_server_fqdn</code>.</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>
 

doc/index.html

@@ -105,7 +105,7 @@
 
 <p>This module differentiates between client- and server configuration. If the <code>FQDN</code> of the puppet client matches the value of <code>cy_server_fqdn</code>, it assumes this to be an ntp time server, else it will be a client.</p>
 
-<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>If you have no local time server(s), leave the default for <code>cy_server_fqdn</code>.</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>
 

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -266,24 +266,6 @@
         —
         <div class='inline'>
 <p>Log information to record. Valid values are ‘measurements’, ‘statistics’, and ‘tracking’.</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>cy_use_lan_server</span>
-      
-      
-        <span class='type'>(<tt>Boolean</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>false</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>Whether to use a local LAN server or external pool.</p>
 </div>
       
     </li>
@@ -299,6 +281,7 @@
         <pre class="lines">
 
 
+21
 22
 23
 24
@@ -331,12 +314,10 @@
 51
 52
 53
-54
+54</pre>
-55
-56</pre>
       </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 21</span>
 
 class confdroid_ntp::params (
 
@@ -345,7 +326,6 @@ class confdroid_ntp::params (
   String $cy_pkg_ensure     = &#39;present&#39;,
 
 # configuration
-  Boolean $cy_use_lan_server  = false,
   String $cy_server_fqdn    = &#39;ntp.example.local&#39;,
   Array $cy_conf_servers    = [&#39;0.pool.ntp.org&#39;, &#39;1.pool.ntp.org&#39;, &#39;2.pool.ntp.org&#39;, &#39;3.pool.ntp.org&#39;],
   String $cy_min_sources    = &#39;3&#39;,

manifests/params.pp

@@ -17,7 +17,6 @@
 # @param [String] cy_leapsectz Leap second timezone file to use. 
 # @param [String] cy_loginfo Log information to record. Valid values are
 #   'measurements', 'statistics', and 'tracking'.
-# @param [Boolean] cy_use_lan_server Whether to use a local LAN server or external pool.
 ###############################################################################
 class confdroid_ntp::params (
 
@@ -26,7 +25,6 @@ class confdroid_ntp::params (
   String $cy_pkg_ensure     = 'present',
 
 # configuration
-  Boolean $cy_use_lan_server  = false,
   String $cy_server_fqdn    = 'ntp.example.local',
   Array $cy_conf_servers    = ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'],
   String $cy_min_sources    = '3',

templates/chrony.conf.erb

@@ -63,13 +63,7 @@ log <%= @cy_loginfo %>
 
 <% if @fqdn != @cy_server_fqdn -%>
 # This is a time client configuration file
-<% if @cy_use_lan_server -%>
 server <%= @cy_server_fqdn %> iburst
-<% else -%>
-# Use public servers from the pool.ntp.org project.
-<% @cy_conf_servers.each do |this_server| -%>
-server <%= this_server %> iburst
-<% end end -%>
 
 # Use NTP servers from DHCP.
 sourcedir /run/chrony-dhcp
@@ -85,7 +79,7 @@ makestep 1.0 3
 rtcsync
 
 # Enable hardware timestamping on all interfaces that support it.
-# hwtimestamp *
+hwtimestamp *
 
 # Increase the minimum number of selectable sources required to adjust
 # the system clock. Primarily for servers.