Recommit for updates in build 24

2025-12-08 14:37:54 +01:00
parent 013d90dfe0
commit 04edf73da4
5 changed files with 102 additions and 126 deletions
--- a/124
+++ b/124
@@ -1,124 +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_postgresql \
-                -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 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 {
-          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 commit --amend --no-edit --allow-empty
-                  git remote add master https://gitea.confdroid.com/confdroid/confdroid_postgresql.git
-                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
-                '''
-          }
-        }
-      }
-    }
-  }
-}
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -97,6 +97,8 @@
 <p>manage extensions (set <code>pl_manage_extensions</code>to <code>true</code>)</p>
 </li><li>
 <p>install and manage pg_bouncer (set <code>pl_use_pg_bouncer</code>to <code>true</code>)</p>
+</li><li>
+<p>enable SL / TLS manage TLS certificates (set <code>pl_ssl_enabled</code>to <code>true</code> and populate content externally through variables)</p>
 </li></ul>

 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
--- a/doc/index.html
+++ b/doc/index.html
@@ -97,6 +97,8 @@
 <p>manage extensions (set <code>pl_manage_extensions</code>to <code>true</code>)</p>
 </li><li>
 <p>install and manage pg_bouncer (set <code>pl_use_pg_bouncer</code>to <code>true</code>)</p>
+</li><li>
+<p>enable SL / TLS manage TLS certificates (set <code>pl_ssl_enabled</code>to <code>true</code> and populate content externally through variables)</p>
 </li></ul>

 <h2 id="label-Repo+Documentation">Repo Documentation</h2>
--- a/doc/puppet_classes/confdroid_postgresql_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_postgresql_3A_3Amain_3A_3Afiles.html
@@ -121,7 +121,49 @@
 23
 24
 25
-26</pre>
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/main/files.pp', line 6</span>
@@ -145,6 +187,48 @@ class confdroid_postgresql::main::files (
      content  =&gt; template(&#39;confdroid_postgresql/postgresql.conf.erb&#39;),
      notify   =&gt; Service[$pl_service],
    }
+    if $pl_ssl_enabled == true {
+      # manage tls certs
+      ## ca.crt
+      file { $pl_ca_crt_file:
+        ensure   =&gt; file,
+        owner    =&gt; &#39;postgres&#39;,
+        group    =&gt; &#39;postgres&#39;,
+        mode     =&gt; &#39;0400&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; postgresql_db_t,
+        seluser  =&gt; unconfined_u,
+        content  =&gt; template($pl_ca_crt_erb),
+        notify   =&gt; Service[$pl_service],
+      }
+      ## server.crt
+      file { $pl_server_crt_file:
+        ensure   =&gt; file,
+        owner    =&gt; &#39;postgres&#39;,
+        group    =&gt; &#39;postgres&#39;,
+        mode     =&gt; &#39;0400&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; postgresql_db_t,
+        seluser  =&gt; unconfined_u,
+        content  =&gt; template($pl_server_crt_erb),
+        notify   =&gt; Service[$pl_service],
+      }
+      ## server.key
+      file { $pl_server_key_file:
+        ensure   =&gt; file,
+        owner    =&gt; &#39;postgres&#39;,
+        group    =&gt; &#39;postgres&#39;,
+        mode     =&gt; &#39;0400&#39;,
+        selrange =&gt; s0,
+        selrole  =&gt; object_r,
+        seltype  =&gt; postgresql_db_t,
+        seluser  =&gt; unconfined_u,
+        content  =&gt; template($pl_server_key_erb),
+        notify   =&gt; Service[$pl_service],
+      }
+    }
  }
 }</pre>
      </td>
--- a/doc/puppet_classes/confdroid_postgresql_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_postgresql_3A_3Aparams.html
@@ -743,7 +743,13 @@
 105
 106
 107
-108</pre>
+108
+109
+110
+111
+112
+113
+114</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 38</span>
@@ -810,6 +816,12 @@ class confdroid_postgresql::params (
  $pl_bouncer_auth_file     = &quot;${pl_bouncer_dir}/userlist.txt&quot;
  $pl_bouncer_auth_erb      = &#39;confdroid_postgresql/server/bouncer/bouncer_users.erb&#39;
  $pl_bouncer_rule_erb      = &#39;confdroid_postgresql/server/bouncer/bouncer_rule.erb&#39;
+  $pl_ca_crt_file           = &quot;${pl_data_dir}/ca.crt&quot;
+  $pl_ca_crt_erb            = &#39;confdroid_postgresql/server/ca.crt.erb&#39;
+  $pl_server_crt_file       = &quot;${pl_data_dir}/server.crt&quot;
+  $pl_server_crt_erb        = &#39;confdroid_postgresql/server/server.crt.erb&#39;
+  $pl_server_key_file       = &quot;${pl_data_dir}/server.key&quot;
+  $pl_server_key_erb        = &#39;confdroid_postgresql/server/server.key.erb&#39;

  # Service
  $pl_service               = &#39;postgresql&#39;