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

Auto-merge for build 33

See merge request puppet/confdroid_ssh!33

.puppet-lint.rc

@@ -1,3 +0,0 @@
---no-variable_scope-check
---no-top_scope_facts
---no-140chars-check

Jenkinsfile

@@ -1,130 +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
-                git fetch origin
-              source_branch="${gitlabSourceBranch:-${BRANCH_NAME:-${GIT_LOCAL_BRANCH:-$GIT_BRANCH}}}"
-              source_branch="${source_branch#origin/}"
-              source_branch="${source_branch#refs/heads/}"
-              if [ -z "$source_branch" ]; then
-                source_branch="development"
-              fi
-              echo "Using source branch: $source_branch"
-              # Create an isolated build branch from the triggering branch revision.
-              git checkout -B jenkins-build-$BUILD_NUMBER "origin/$source_branch"
-                # Merge the current master into the build branch before validation.
-                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 fetch origin
-                git checkout -B master origin/master
-                git merge --no-ff jenkins-build-$BUILD_NUMBER -m "Merge build $BUILD_NUMBER into master"
-                git push origin master
-            '''
-        }
-      }
-    }
-      stage('Mirror to Gitea') {
-        steps {
-          withCredentials([usernamePassword(
-            credentialsId: 'Jenkins-gitea',
-            usernameVariable: 'GITEA_USER',
-            passwordVariable: 'GITEA_TOKEN')]) {
-            script {
-                sh '''
-                  git fetch origin
-                  git checkout master
-                  git reset --hard origin/master
-                  git remote get-url master >/dev/null 2>&1 \
-                    && git remote set-url master https://sourcecode.confdroid.com/confdroid/confdroid_ssh.git \
-                    || 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 --force master refs/heads/master:refs/heads/master
-                  '''
-          }
-        }
-      }
-    }
-  }
-}

README.md

@@ -25,12 +25,10 @@
 ## Features
 
 - install required binaries
-- manage required files and directories including selinux context 
+- manage selinux rules
 - manage service
 - (optional) manage firewall
 
-> ToDo: Define for custom drop-in configurations
-
 ## Support
 
 - Rocky 9 (Any RHEL 9 based OS should work but has not been tested)

doc/file.README.html

@@ -97,17 +97,13 @@
 <ul><li>
 <p>install required binaries</p>
 </li><li>
-<p>manage required files and directories including selinux context</p>
+<p>manage selinux rules</p>
 </li><li>
 <p>manage service</p>
 </li><li>
 <p>(optional) manage firewall</p>
 </li></ul>
 
-<blockquote>
-<p>ToDo: Define for custom drop-in configurations</p>
-</blockquote>
-
 <h2 id="label-Support">Support</h2>
 <ul><li>
 <p>Rocky 9 (Any RHEL 9 based OS should work but has not been tested)</p>

doc/index.html

@@ -97,17 +97,13 @@
 <ul><li>
 <p>install required binaries</p>
 </li><li>
-<p>manage required files and directories including selinux context</p>
+<p>manage selinux rules</p>
 </li><li>
 <p>manage service</p>
 </li><li>
 <p>(optional) manage firewall</p>
 </li></ul>
 
-<blockquote>
-<p>ToDo: Define for custom drop-in configurations</p>
-</blockquote>
-
 <h2 id="label-Support">Support</h2>
 <ul><li>
 <p>Rocky 9 (Any RHEL 9 based OS should work but has not been tested)</p>