Recommit for updates in build 30

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_3Adirs.html

@@ -202,8 +202,8 @@ class confdroid_ntp::main::dirs (
   # /run/chrony-dhcp
   file { '/run/chrony-dhcp':
     ensure   => directory,
-    owner    => 'chrony',
+    owner    => 'root',
-    group    => 'chrony',
+    group    => 'root',
     mode     => '0755',
     selrange => s0,
     selrole  => object_r,

doc/puppet_classes/confdroid_ntp_3A_3Amain_3A_3Afiles.html

@@ -123,7 +123,28 @@
 25
 26
 27
-28</pre>
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -148,8 +169,29 @@ class confdroid_ntp::main::files (
   }
 
   # drift file /var/lib/chrony/drift
+  file { $cy_drift_file:
+    ensure   =&gt; file,
+    owner    =&gt; &#39;chrony&#39;,
+    group    =&gt; &#39;chrony&#39;,
+    mode     =&gt; &#39;0644&#39;,
+    selrange =&gt; s0,
+    selrole  =&gt; object_r,
+    seltype  =&gt; chronyd_var_lib_t,
+    seluser  =&gt; system_u,
+  }
 
   # log rotation
+  file { $cy_logrotate_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_logrotate_erb),
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_ntp_3A_3Aparams.html

@@ -333,7 +333,10 @@
 53
 54
 55
-56</pre>
+56
+57
+58
+59</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 22</span>
@@ -366,6 +369,9 @@ class confdroid_ntp::params (
 # files
   $cy_conf_file               = &#39;/etc/chrony.conf&#39;
   $cy_conf_erb                = &#39;confdroid_ntp/chrony.conf.erb&#39;
+  $cy_drift_file              = &#39;/var/lib/chrony/drift&#39;
+  $cy_logrotate_file          = &#39;/etc/logrotate.d/chrony&#39;
+  $cy_logrotate_erb           = &#39;confdroid_ntp/logrotate.chrony.erb&#39;
 
 # service
   $cy_service                 = &#39;chronyd&#39;

manifests/main/files.pp

@@ -23,6 +23,27 @@ class confdroid_ntp::main::files (
   }
 
   # drift file /var/lib/chrony/drift
+  file { $cy_drift_file:
+    ensure   => file,
+    owner    => 'chrony',
+    group    => 'chrony',
+    mode     => '0644',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => chronyd_var_lib_t,
+    seluser  => system_u,
+  }
 
   # log rotation
+  file { $cy_logrotate_file:
+    ensure   => file,
+    owner    => 'root',
+    group    => 'root',
+    mode     => '0644',
+    selrange => s0,
+    selrole  => object_r,
+    seltype  => etc_t,
+    seluser  => system_u,
+    content  => template($cy_logrotate_erb),
+  }
 }

manifests/params.pp

@@ -47,6 +47,9 @@ class confdroid_ntp::params (
 # files
   $cy_conf_file               = '/etc/chrony.conf'
   $cy_conf_erb                = 'confdroid_ntp/chrony.conf.erb'
+  $cy_drift_file              = '/var/lib/chrony/drift'
+  $cy_logrotate_file          = '/etc/logrotate.d/chrony'
+  $cy_logrotate_erb           = 'confdroid_ntp/logrotate.chrony.erb'
 
 # service
   $cy_service                 = 'chronyd'

templates/logrotate.chrony.erb

@@ -0,0 +1,9 @@
+# file created by Puppet, manual changes will be overwritten
+/var/log/chrony/*.log {
+    missingok
+    nocreate
+    sharedscripts
+    postrotate
+        /usr/bin/chronyc cyclelogs > /dev/null 2>&1 || true
+    endscript
+}