Merge branch 'jenkins-build-15' into 'master'

Auto-merge for build 15

See merge request puppet/confdroid_ssh!15

Jenkinsfile

@@ -1,129 +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_ssh \
-                -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 -o merge_request.create \
-                         -o merge_request.target=master \
-                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
-                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
-                         -o merge_request.merge_when_pipeline_succeeds=true \
-                         origin jenkins-build-$BUILD_NUMBER
-            '''
-        }
-      }
-    }
-      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 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_ssh.git
-                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
-                  '''
-          }
-        }
-      }
-    }
-  }
-}

doc/puppet_classes/confdroid_ssh_3A_3Afirewall_3A_3Aiptables.html

@@ -111,16 +111,7 @@
 13
 14
 15
-16
+16</pre>
-17
-18
-19
-20
-21
-22
-23
-24
-25</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -128,17 +119,8 @@
 class confdroid_ssh::firewall::iptables (
 
 ) inherits confdroid_ssh::params {
-  case $ssh_use_firewall {
-    true, &#39;true&#39;, &#39;yes&#39;, &#39;1&#39;: {
-      $ssh_fw_ensure = &#39;present&#39;
-    }
-    default: {
-      $ssh_fw_ensure = &#39;absent&#39;
-    }
-  }
-
   firewall { &quot;${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}&quot;:
-    ensure =&gt; $ssh_fw_ensure,
+    ensure =&gt; $ssh_use_firewall,
     proto  =&gt; &#39;tcp&#39;,
     source =&gt; $ssh_source_range,
     dport  =&gt; $ssh_fw_port,

doc/puppet_classes/confdroid_ssh_3A_3Aparams.html

@@ -151,15 +151,15 @@
         <span class='name'>ssh_use_firewall</span>
       
       
-        <span class='type'>(<tt>Boolean</tt>)</span>
+        <span class='type'>(<tt>String</tt>)</span>
       
       
-        <em class="default">(defaults to: <tt>true</tt>)</em>
+        <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
       
       
         &mdash;
         <div class='inline'>
-<p>whether to manage firewall settings</p>
+<p>whether set the fw rule to present or absent.</p>
 </div>
       
     </li>
@@ -355,7 +355,6 @@
         <pre class="lines">
 
 
-19
 20
 21
 22
@@ -395,10 +394,11 @@
 56
 57
 58
-59</pre>
+59
+60</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 19</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 20</span>
 
 class confdroid_ssh::params (
 
@@ -406,7 +406,7 @@ class confdroid_ssh::params (
   String $pkg_ensure          = &#39;present&#39;,
 
   # firewall settings
-  Boolean $ssh_use_firewall   = true,
+  String $ssh_use_firewall   = &#39;present&#39;,
   String $ssh_fw_port         = &#39;22&#39;,
   String $ssh_fw_order        = &#39;50&#39;,
   String $ssh_source_range    = &#39;0.0.0.0/0&#39;,

manifests/firewall/iptables.pp

@@ -6,17 +6,8 @@
 class confdroid_ssh::firewall::iptables (
 
 ) inherits confdroid_ssh::params {
-  case $ssh_use_firewall {
-    true, 'true', 'yes', '1': {
-      $ssh_fw_ensure = 'present'
-    }
-    default: {
-      $ssh_fw_ensure = 'absent'
-    }
-  }
-
   firewall { "${ssh_fw_order}${ssh_fw_port} allow SSH on port ${ssh_fw_port}":
-    ensure => $ssh_fw_ensure,
+    ensure => $ssh_use_firewall,
     proto  => 'tcp',
     source => $ssh_source_range,
     dport  => $ssh_fw_port,

manifests/params.pp

@@ -4,7 +4,8 @@
 # @summary Class contains all class parameters for confdroid_ssh
 # @param [Array] ssh_reqpackages packages to install
 # @param [String] pkg_ensure version to install: 'present' or 'latest'
-# @param [Boolean] ssh_use_firewall whether to manage firewall settings
+# @param [String] ssh_use_firewall whether set the fw rule to 
+#   present or absent.
 # @param [String] ssh_fw_port port to use for SSHD and in fw
 # @param [String] ssh_fw_order order of firewall rule
 # @param [String] ssh_source_range source range for firewall rule
@@ -22,7 +23,7 @@ class confdroid_ssh::params (
   String $pkg_ensure          = 'present',
 
   # firewall settings
-  Boolean $ssh_use_firewall   = true,
+  String $ssh_use_firewall   = 'present',
   String $ssh_fw_port         = '22',
   String $ssh_fw_order        = '50',
   String $ssh_source_range    = '0.0.0.0/0',