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

Auto-merge for build 18

See merge request puppet/confdroid_ssh!18

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

@@ -466,6 +466,60 @@
         —
         <div class='inline'>
 <p>type of host key to use if ssh_use_specific_hostkey is true</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_rekeylimit</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;default none&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>RekeyLimit setting for sshd_config. Default is ‘default none’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_syslog_facility</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;AUTH&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>SyslogFacility setting for sshd_config. Default is ‘AUTH’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ssh_log_level</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;INFO&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>LogLevel setting for sshd_config. Default is ‘INFO’.</p>
 </div>
       
     </li>
@@ -481,12 +535,6 @@
         <pre class="lines">
 
 
-31
-32
-33
-34
-35
-36
 37
 38
 39
@@ -528,10 +576,19 @@
 75
 76
 77
-78</pre>
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 31</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 37</span>
 
 class confdroid_ssh::params (
 
@@ -559,6 +616,9 @@ class confdroid_ssh::params (
   String  $ssh_authorized_keys_command_user = &#39;nobody&#39;,
   Boolean $ssh_use_specific_hostkey         = false,
   String  $ssh_hostkey_type                 = &#39;rsa&#39;,
+  String  $ssh_rekeylimit                   = &#39;default none&#39;,
+  String  $ssh_syslog_facility              = &#39;AUTH&#39;,
+  String  $ssh_log_level                    = &#39;INFO&#39;
 
 ) {
 # default facts

manifests/params.pp

@@ -27,6 +27,12 @@
 # @param [Boolean] ssh_use_specific_hostkey whether to use a specific host key
 # @param [String] ssh_hostkey_type type of host key to use if 
 #   ssh_use_specific_hostkey is true
+# @param [String] ssh_rekeylimit RekeyLimit setting for sshd_config. 
+#   Default is 'default none'.
+# @param [String] ssh_syslog_facility SyslogFacility setting for sshd_config.
+#   Default is 'AUTH'.
+# @param [String] ssh_log_level LogLevel setting for sshd_config.
+#   Default is 'INFO'.
 ##############################################################################
 class confdroid_ssh::params (
 
@@ -54,6 +60,9 @@ class confdroid_ssh::params (
   String  $ssh_authorized_keys_command_user = 'nobody',
   Boolean $ssh_use_specific_hostkey         = false,
   String  $ssh_hostkey_type                 = 'rsa',
+  String  $ssh_rekeylimit                   = 'default none',
+  String  $ssh_syslog_facility              = 'AUTH',
+  String  $ssh_log_level                    = 'INFO'
 
 ) {
 # default facts

templates/sshd_custom_conf.erb

@@ -9,11 +9,6 @@ Port <%= @ssh_fw_port %>
 AddressFamily <%= @ssh_address_family %>
 ListenAddress <%= @ssh_listen_address %> 
 
-PermitRootLogin <%= @ssh_root_login %>
-StrictModes <%= @ssh_strict_modes %>
-MaxAuthTries <%= @ssh_max_auth_tries %>
-MaxSessions <%= @ssh_max_sessions %>
-
 PubkeyAuthentication <%= @ssh_pubkey_auth %>
 AuthorizedKeysFile	<%= @ssh_auth_key_files %>
 
@@ -24,3 +19,13 @@ AuthorizedKeysCommandUser <%= @ssh_authorized_keys_command_user %>
 <% if @ssh_use_specific_hostkey -%>
 HostKey /etc/ssh/ssh_host_<%= @ssh_hostkey_type %>_key
 <% end -%>
+
+RekeyLimit <%= @ssh_rekeylimit %>
+
+SyslogFacility <%= @ssh_syslog_facility %>
+LogLevel <%= @ssh_log_level %>
+
+PermitRootLogin <%= @ssh_root_login %>
+StrictModes <%= @ssh_strict_modes %>
+MaxAuthTries <%= @ssh_max_auth_tries %>
+MaxSessions <%= @ssh_max_sessions %>