Recommit for updates in build 7

Jenkinsfile

@@ -1,127 +0,0 @@
-pipeline {
-    agent {
-      label 'puppet'
-    }
-
-    post {
-        always {
-            deleteDir() /* clean up our workspace */
-        }
-        success {
-            updateGitlabCommitStatus state: 'success'
-        }
-        failure {
-            updateGitlabCommitStatus state: 'failed'
-            step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true])
-        }
-    }
-
-    options {
-          gitLabConnection('gitlab.confdroid.com')
-    }
-
-    stages {
-
-      stage('pull master') {
-        steps {
-          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''
-                git config user.name "Jenkins Server"
-                git config user.email jenkins@confdroid.com
-                # Ensure we're on the development branch (triggered by push)
-                git checkout development
-                # Create jenkins branch from development
-                git checkout -b jenkins-build-$BUILD_NUMBER
-                # Optionally merge master into jenkins to ensure compatibility
-                git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
-            '''
-        }
-      }
-    }
-
-      stage('puppet parser') {
-        steps {
-          sh '''for file in $(find . -iname \'*.pp\'); do
-            /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1;
-            done;'''
-          }
-        }
-
-      stage('check templates') {
-        steps{
-          sh '''for file in $(find . -iname \'*.erb\');
-            do erb -P -x -T "-" $file | ruby -c || exit 1;
-            done;'''
-        }
-      }
-
-      stage('puppet-lint') {
-        steps {
-          sh '''/usr/local/bin/puppet-lint . \\
-                --no-variable_scope-check \\
-                || { echo "Puppet lint failed"; exit 1; }
-            '''
-          }
-        }
-
-      stage('SonarScan') {
-         steps {
-            withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
-              sh '''
-              /opt/sonar-scanner/bin/sonar-scanner \
-                -Dsonar.projectKey=confdroid_ntp \
-                -Dsonar.sources=. \
-                -Dsonar.host.url=https://sonarqube.confdroid.com \
-                -Dsonar.token=$SONAR_TOKEN
-                '''
-              }
-            }
-          }
-
-      stage('create Puppet documentation') {
-        steps {
-          sh '/opt/puppetlabs/bin/puppet strings'
-        }
-      }
-
-      stage('update repo') {
-        steps {
-          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''
-                git config user.name "Jenkins Server"
-                git config user.email jenkins@confdroid.com
-                git rm -r --cached .vscode || echo "No .vscode to remove from git"
-                git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push origin HEAD:master
-            '''
-        }
-      }
-    }
-      stage('Mirror to Gitea') {
-        steps {
-          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            withCredentials([usernamePassword(
-              credentialsId: 'Jenkins-gitea',
-              usernameVariable: 'GITEA_USER',
-              passwordVariable: 'GITEA_TOKEN')]) {
-              script {
-                // Checkout from GitLab (already done implicitly)
-                  sh '''
-                    git checkout master
-                    git pull origin master
-                    git branch -D development
-                    git branch -D jenkins-build-$BUILD_NUMBER
-                    git rm -f Jenkinsfile
-                    git rm -r --cached .vscode || echo "No .vscode to remove from git"
-                    git commit --amend --no-edit --allow-empty
-                    git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_ntp.git
-                    git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                    push master --mirror
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}

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

@@ -140,6 +140,42 @@
         —
         <div class='inline'>
 <p>Ensure state of the required packages.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>cy_server_fqdn</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;ntp.example.com&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>FQDN of the NTP server to configure. If the fqdn of the host matches this value, a time server will be configured, else a client.</p>
+</div>
+      
+    </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>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>List of NTP servers to point to as time source</p>
 </div>
       
     </li>
@@ -155,10 +191,6 @@
         <pre class="lines">
 
 
-9
-10
-11
-12
 13
 14
 15
@@ -174,27 +206,43 @@
 25
 26
 27
-28</pre>
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 9</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 13</span>
 
 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
+  String $cy_server_fqdn    = &#39;ntp.example.com&#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;],
 
 ) {
 # 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

@@ -19,7 +19,7 @@ class confdroid_ntp::main::files (
     seltype  => etc_t,
     seluser  => system_u,
     content  => template($cy_conf_erb),
-    notify  => Service[$cy_service],
+    notify   => Service[$cy_service],
   }
 
   # drift file /var/lib/chrony/drift

manifests/params.pp

@@ -5,7 +5,11 @@
 # @param [Array] cy_reqpackages List of required packages to install 
 #   for the confdroid_ntp module.
 # @param [String] cy_pkg_ensure Ensure state of the required packages.
-##############################################################################
+# @param [String] cy_server_fqdn FQDN of the NTP server to configure. 
+#   If the fqdn of the host matches this value, a time server will be 
+#   configured, else a client.
+# @param [Array] cy_conf_servers List of NTP servers to point to as time source
+###############################################################################
 class confdroid_ntp::params (
 
 # installation
@@ -13,6 +17,7 @@ class confdroid_ntp::params (
   String $cy_pkg_ensure     = 'present',
 
 # configuration
+  String $cy_server_fqdn    = 'ntp.example.com',
   Array $cy_conf_servers    = ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'],
 
 ) {

templates/chrony.conf.erb

@@ -1,3 +1,18 @@
 ################################################################################
 ###    chrony.conf created by Puppet, manual changes will be overwritten     ###
-################################################################################
+################################################################################
+###    original chrony.conf file can be found at https://3for.me/2t0an       ### 
+################################################################################
+
+<%  if @fqdn == @cy_server_fqdn -%>
+# This is a time server configuration file
+<% @cy_conf_servers.each do |this_server| -%>
+pool <%= this_server %> iburst
+
+<% end -%>
+
+<% if @fqdn != @cy_server_fqdn -%>
+# This is a time client configuration file
+<% end -%>
+
+<% end -%>