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

Auto-merge for build 7

See merge request puppet/confdroid_ssh!7

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
-                  '''
-          }
-        }
-      }
-    }
-  }
-}

manifests/main/files.pp

@@ -35,5 +35,12 @@ class confdroid_ssh::main::files (
       content  => template($sshd_custom_erb),
       notify   => Service[$sshd_service],
     }
+    # we want the default root login setting to be managed by the custom conf, 
+    # so we remove the default file if it exists
+    file { $sshd_root_login_file:
+      ensure => absent,
+      path   => $sshd_root_login_file,
+      notify => Service[$sshd_service],
+    }
   }
 }

manifests/params.pp

@@ -11,6 +11,7 @@
 # @param [Boolean] ssh_manage_config whether to manage the configuration
 # @param [String] ssh_address_family AddressFamily setting for sshd_config
 # @param [String] ssh_listen_address ListenAddress setting for sshd_config
+# @param [String] ssh_root_login PermitRootLogin setting for sshd_config
 ##############################################################################
 class confdroid_ssh::params (
 
@@ -27,6 +28,7 @@ class confdroid_ssh::params (
   Boolean $ssh_manage_config  = true,
   String  $ssh_address_family = 'any',
   String  $ssh_listen_address = '0.0.0.0',
+  String  $ssh_root_login     = 'prohibit-password',
 
 ) {
 # default facts
@@ -36,14 +38,15 @@ class confdroid_ssh::params (
   $os_name                  = $facts['os']['name']
   $os_release               = $facts['os']['release']['major']
 
-  $sshd_user          = 'root'
+  $sshd_user                = 'root'
-  $ssh_etc_path       = '/etc/ssh'
+  $ssh_etc_path             = '/etc/ssh'
-  $sshd_service       = 'sshd'
+  $sshd_service             = 'sshd'
-  $sshd_config_path   = "${ssh_etc_path}/sshd_config"
+  $sshd_config_path         = "${ssh_etc_path}/sshd_config"
-  $sshd_custom_path   = "${ssh_etc_path}/sshd_config.d"
+  $sshd_custom_path         = "${ssh_etc_path}/sshd_config.d"
-  $sshd_custom_conf   = "${sshd_custom_path}/10-custom.conf"
+  $sshd_custom_conf         = "${sshd_custom_path}/10-custom.conf"
-  $sshd_custom_erb    = 'confdroid_ssh/sshd_custom_conf.erb'
+  $sshd_custom_erb          = 'confdroid_ssh/sshd_custom_conf.erb'
-  $sshd_config_erb    = 'confdroid_ssh/sshd_config.erb'
+  $sshd_config_erb          = 'confdroid_ssh/sshd_config.erb'
+  $sshd_root_login_file     = "${sshd_custom_path}/01-permitrootlogin.conf"
 
   # includes must be last
   include confdroid_ssh::main::config

templates/sshd_custom_conf.erb

@@ -8,3 +8,5 @@
 Port <%= @ssh_fw_port %>
 AddressFamily <%= @ssh_address_family %>
 ListenAddress <%= @ssh_listen_address %> 
+
+PermitRootLogin <%= @ssh_root_login %>