Recommit for updates in build 5

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Afiles.html

@@ -109,7 +109,21 @@
 11
 12
 13
-14</pre>
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -120,6 +134,20 @@ class confdroid_ntp::main::files (
   require confdroid_ntp::main::dirs
 
   # main configuration file
+  file { $cy_conf_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_conf_erb),
+    notify  =&gt; Service[$cy_service],
+  }
+
+  # drift file /var/lib/chrony/drift
 
   # log rotation
 }</pre>

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Aservice.html

@@ -122,7 +122,7 @@ class confdroid_ntp::main::service (
 ) inherits confdroid_ntp::params {
   require confdroid_ntp::main::files
 
-  service { $cy_service_name:
+  service { $cy_service:
     ensure     => running,
     hasstatus  => true,
     hasrestart => true,

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -144,6 +144,19 @@
       
     </li>
   
+    <li>
+      
+        <span class='name'>cy_conf_servers</span>
+      
+      
+        <span class='type'>(<tt>Array</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[&#39;0.pool.ntp.org&#39;, &#39;1.pool.ntp.org&#39;, &#39;2.pool.ntp.org&#39;, &#39;3.pool.ntp.org&#39;]</tt>)</em>
+      
+      
+    </li>
+  
 </ul>
 
 
@@ -174,7 +187,12 @@
 25
 26
 27
-28</pre>
+28
+29
+30
+31
+32
+33</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 9</span>
@@ -182,19 +200,24 @@
 class confdroid_ntp::params (
 
 # installation
-  Array $cy_reqpackages    = [&#39;chrony&#39;],
-  String $cy_pkg_ensure    = &#39;present&#39;,
+  Array $cy_reqpackages     = [&#39;chrony&#39;],
+  String $cy_pkg_ensure     = &#39;present&#39;,
+
+# configuration
+  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;],
 
 ) {
 # defaults
-  $fqdn               = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
+  $fqdn                     = $facts[&#39;networking&#39;][&#39;fqdn&#39;]
 
 # dirs
 
 # files
+  $cy_conf_file             = &#39;/etc/chrony.conf&#39;
+  $cy_conf_erb              = &#39;confdroid_ntp/chrony.conf.erb&#39;
 
 # service
-  $cy_service_name    = &#39;chronyd&#39;
+  $cy_service               = &#39;chronyd&#39;
 
 # includes must be last
   include confdroid_ntp::main::config

manifests/main/files.pp

@@ -9,6 +9,20 @@ class confdroid_ntp::main::files (
   require confdroid_ntp::main::dirs
 
   # main configuration file
+  file { $cy_conf_file:
+    ensure   => file,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0644',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+    content  => template($cy_conf_erb),
+    notify  => Service[$cy_service],
+  }
+
+  # drift file /var/lib/chrony/drift
 
   # log rotation
 }

manifests/main/service.pp

@@ -8,7 +8,7 @@ class confdroid_ntp::main::service (
 ) inherits confdroid_ntp::params {
   require confdroid_ntp::main::files
 
-  service { $cy_service_name:
+  service { $cy_service:
     ensure     => running,
     hasstatus  => true,
     hasrestart => true,

manifests/params.pp

@@ -9,19 +9,24 @@
 class confdroid_ntp::params (
 
 # installation
-  Array $cy_reqpackages    = ['chrony'],
-  String $cy_pkg_ensure    = 'present',
+  Array $cy_reqpackages     = ['chrony'],
+  String $cy_pkg_ensure     = 'present',
+
+# configuration
+  Array $cy_conf_servers    = ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'],
 
 ) {
 # defaults
-  $fqdn               = $facts['networking']['fqdn']
+  $fqdn                     = $facts['networking']['fqdn']
 
 # dirs
 
 # files
+  $cy_conf_file             = '/etc/chrony.conf'
+  $cy_conf_erb              = 'confdroid_ntp/chrony.conf.erb'
 
 # service
-  $cy_service_name    = 'chronyd'
+  $cy_service               = 'chronyd'
 
 # includes must be last
   include confdroid_ntp::main::config

templates/chrony.conf.erb

@@ -0,0 +1,3 @@
+################################################################################
+###    chrony.conf created by Puppet, manual changes will be overwritten     ###
+################################################################################