Recommit for updates in build 4

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Afiles.html

@@ -109,21 +109,7 @@
 11
 12
 13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28</pre>
+14</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -134,20 +120,6 @@ 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:
+  service { $cy_service_name:
     ensure     => running,
     hasstatus  => true,
     hasrestart => true,

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -144,19 +144,6 @@
       
     </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>
 
 
@@ -187,12 +174,7 @@
 25
 26
 27
-28
-29
-30
-31
-32
-33</pre>
+28</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 9</span>
@@ -203,9 +185,6 @@ class confdroid_ntp::params (
   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;]
@@ -213,11 +192,9 @@ class confdroid_ntp::params (
 # dirs
 
 # files
-  $cy_conf_file             = &#39;/etc/chrony.conf&#39;
-  $cy_conf_erb              = &#39;confdroid_ntp/chrony.conf.erb&#39;
 
 # service
-  $cy_service               = &#39;chronyd&#39;
+  $cy_service_name    = &#39;chronyd&#39;
 
 # includes must be last
   include confdroid_ntp::main::config

manifests/main/files.pp

@@ -9,20 +9,6 @@ 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:
+  service { $cy_service_name:
     ensure     => running,
     hasstatus  => true,
     hasrestart => true,

manifests/params.pp

@@ -12,9 +12,6 @@ class confdroid_ntp::params (
   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']
@@ -22,11 +19,9 @@ class confdroid_ntp::params (
 # dirs
 
 # files
-  $cy_conf_file             = '/etc/chrony.conf'
-  $cy_conf_erb              = 'confdroid_ntp/chrony.conf.erb'
 
 # service
-  $cy_service               = 'chronyd'
+  $cy_service_name    = 'chronyd'
 
 # includes must be last
   include confdroid_ntp::main::config

templates/chrony.conf.erb

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