Recommit for updates in build 20

Jenkinsfile

@@ -1,128 +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_puppet \
-                -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_puppet.git
-                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}

doc/puppet_classes/confdroid_puppet_3A_3Amain_3A_3Adirs.html

@@ -130,7 +130,21 @@
 32
 33
 34
-35</pre>
+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/dirs.pp', line 6</span>
@@ -152,9 +166,9 @@ class confdroid_puppet::main::dirs (
     seluser  =&gt; system_u,
   }
 
-  file { $pt_puppet_dir:
+  file { $pt_puppetdir:
     ensure   =&gt; directory,
-    path     =&gt; $pt_puppet_dir,
+    path     =&gt; $pt_puppetdir,
     owner    =&gt; &#39;root&#39;,
     group    =&gt; &#39;root&#39;,
     mode     =&gt; &#39;0755&#39;,
@@ -164,6 +178,20 @@ class confdroid_puppet::main::dirs (
     seluser  =&gt; system_u,
   }
 
+  if $fqdn == $pt_pm_fqdn {
+    # puppetserver dir
+    file { $pt_server_dir:
+      ensure   =&gt; directory,
+      path     =&gt; $pt_server_dir,
+      owner    =&gt; &#39;puppet&#39;,
+      group    =&gt; &#39;puppet&#39;,
+      mode     =&gt; &#39;0750&#39;,
+      selrange =&gt; s0,
+      selrole  =&gt; object_r,
+      seltype  =&gt; puppet_etc_t,
+      seluser  =&gt; system_u,
+    }
+  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_puppet_3A_3Aparams.html

@@ -1358,7 +1358,8 @@
 219
 220
 221
-222</pre>
+222
+223</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/params.pp', line 69</span>
@@ -1450,6 +1451,7 @@ class confdroid_puppet::params (
   $pt_main_dir                      = &#39;/etc/puppetlabs&#39;
   $pt_puppetdir                     = &quot;${pt_main_dir}/puppet&quot;
   $pt_code_dir                      = &quot;${pt_main_dir}/code&quot;
+  $pt_server_dir                    = &quot;${pt_main_dir}/puppetserver&quot;
   $pt_environmentspath              = &quot;${pt_code_dir}/environments&quot;
   $pt_ssldir                        = &quot;${pt_puppetdir}/ssl&quot;
   $pt_privatekeydir                 = &quot;${pt_ssldir}/private_keys&quot;

manifests/main/dirs.pp

@@ -33,6 +33,17 @@ class confdroid_puppet::main::dirs (
   }
 
   if $fqdn == $pt_pm_fqdn {
-    # server dirs here
+    # puppetserver dir
+    file { $pt_server_dir:
+      ensure   => directory,
+      path     => $pt_server_dir,
+      owner    => 'puppet',
+      group    => 'puppet',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => puppet_etc_t,
+      seluser  => system_u,
+    }
   }
 }

manifests/params.pp

@@ -153,6 +153,7 @@ class confdroid_puppet::params (
   $pt_main_dir                      = '/etc/puppetlabs'
   $pt_puppetdir                     = "${pt_main_dir}/puppet"
   $pt_code_dir                      = "${pt_main_dir}/code"
+  $pt_server_dir                    = "${pt_main_dir}/puppetserver"
   $pt_environmentspath              = "${pt_code_dir}/environments"
   $pt_ssldir                        = "${pt_puppetdir}/ssl"
   $pt_privatekeydir                 = "${pt_ssldir}/private_keys"