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

Auto-merge for build 1

See merge request puppet/confdroid_selinux!1

.gitignore

@@ -1,5 +1,39 @@
+.git/
+.*.sw[op]
+.metadata
 .yardoc
-Gemfile.lock
+.yardwarns
-FileList
 .scannerwork
-.vscode
+*.iml
+/.bundle/
+/.idea/
+/.vagrant/
+/coverage/
+/bin/
+/doc/
+/Gemfile.local
+/Gemfile.lock
+/junit/
+/log/
+/pkg/
+/spec/fixtures/manifests/
+/spec/fixtures/modules/*
+/tmp/
+/vendor/
+/.vendor/
+/convert_report.txt
+/update_report.txt
+.DS_Store
+.project
+.envrc
+/inventory.yaml
+/spec/fixtures/litmus_inventory.yaml
+.resource_types
+.modules
+.task_cache.json
+.plan_cache.json
+.rerun.json
+bolt-debug.log
+.vscode
+.puppet-lint.rc
+.rspec

.puppet-lint.rc

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

.vscode/settings.json

@@ -1,11 +0,0 @@
-{
-    "cSpell.words": [
-        "getenforce",
-        "policycoreutils",
-        "SELINUXTYPE",
-        "setenforce",
-        "setools",
-        "setroubleshoot",
-        "sysconfig"
-    ]
-}

Jenkinsfile

@@ -1,127 +0,0 @@
-pipeline {
-    agent any
-
-    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_selinux \
-                -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_selinux.git
-                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                  push master --mirror
-                  '''
-          }
-        }
-      }
-    }
-  }
-}

README.md

@@ -1,7 +1,8 @@
 # Readme
 
-[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_selinux&style=plastic)](https://jenkins.confdroid.com/job/confdroid_selinux/)
+[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_selinux)](https://jenkins.confdroid.com/job/confdroid_selinux/)
-[![Security Hotspots](https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_selinux&metric=security_hotspots&token=sqb_cc73d9e100a7cda91c7f45b8a7690bd16498e852)](https://sonarqube.confdroid.com/dashboard?id=confdroid_selinux)
+
+[[_TOC_]]
 
 ## Synopsis
 
@@ -17,12 +18,12 @@
 
 Installation:
 
-- install binaries required for selinux and  related tools
+* install binaries required for selinux and  related tools
 
 Configuration
 
-- manage `/etc/sysconfig/selinux` file (file system permissions, selinux context, content)
+* manage `/etc/sysconfig/selinux` file (file system permissions, selinux context, content)
-- manage current selinux status (permissive,enforcing)
+* manage current selinux status (permissive,enforcing)
 
 ## Repo Documentation
 
@@ -32,11 +33,11 @@ See the full Puppet documentation including parameters in `docs/index.html`.
 
 All dependencies must be included in the catalogue.
 
-- [confdroid_resources](https://sourcecode.confdroid.com/confdroid/confdroid_resources) for yum repo resources.
+* [cd_resources](https://gitlab.confdroid.com/puppet/cd_resources) for yum repo resources.
 
 ## Deployment
 
-- native Puppet deployment
+* native Puppet deployment
 
 via site.pp or nodes.pp
 
@@ -46,9 +47,9 @@ node 'example.example.net' {
 }
 ```
 
-- through Foreman:
+* through Foreman:
 
-In order to apply parameters through Foreman, **confdroid_selinux::params*- must be added to the host or host group in question.
+In order to apply parameters through Foreman, **__confdroid_selinux::params__** must be added to the host or host group in question.
 
 See [more details about class deployment on Confdroid.com](https://confdroid.com/2017/05/deploying-our-puppet-modules/).
 
@@ -58,26 +59,25 @@ All files and directories are configured with correct selinux context. If selinu
 
 ## Known Problems
 
-- Systems reconfigured with selinux disabled require once a reboot for selinux to be enabled. This module will **not**- do the reboot for you to avoid unexpected outages.
+* Systems reconfigured with selinux disabled require once a reboot for selinux to be enabled. This module will **__not__** do the reboot for you to avoid unexpected outages.
 
 ## Support
 
-- OS: Rocky 9 (any RHEL9-based OS should work, but Rocky has been tested)
+* OS: CentOS 7
-- Puppet 8
+* Puppet 5,6
 
 ## Tests
 
-- Puppet Lint
+* Puppet Lint
-  - excluded tests:
+  * excluded tests:
-    - `--no-variable_scope-check`: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters.
+    * `--no-variable_scope-check`: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters.
-- Puppet Parser
+* Puppet Parser
-- ERB Template Parser
+* ERB Template Parser
-- Sonar Quality Gate
+* Sonar Quality Gate
 
 ## Contact Us
 
-- [contact Us](https://confdroid.com/contact/)
+[contact Us](https://confdroid.com/contact/)
-- [Feedback Portal](https://feedback.confdroid.com/)
 
 ## Disclaimer
 

manifests/params.pp

@@ -22,7 +22,7 @@
 ##############################################################################
 class confdroid_selinux::params (
 
-  Array[String] $sx_reqpackages       = ['selinux-policy','policycoreutils','setroubleshoot-server','policycoreutils-python-utils'],
+  Array[String] $sx_reqpackages       = ['selinux-policy','policycoreutils','setroubleshoot-server','policycoreutils-python'],
   String $sx_pkg_ensure               = 'latest',
   String $sx_selinux_status           = 'enforcing',
   String $sx_selinux_type             = 'targeted',
@@ -36,11 +36,11 @@ class confdroid_selinux::params (
   $os_release               = $facts['os']['release']['major']
 
 # directories
-  $sx_main_dir              = '/etc/selinux'
+  $sx_main_dir        = '/etc/selinux'
 
 # files
-  $sx_main_file             = "${sx_main_dir}/config"
+  $sx_main_file       = "${sx_main_dir}/config"
-  $sx_main_file_erb         = 'confdroid_selinux/main/selinux_config.erb'
+  $sx_main_file_erb   = 'confdroid_selinux/main/selinux_config.erb'
 
 # includes must be last
   include confdroid_selinux::main::config

templates/main/selinux_config.erb

@@ -1,7 +1,6 @@
 ################################################################################
 ##########        /etc/selinux/config managed by Puppet               ##########
-##########        manual changes will be overwritten !!!              ##########   
+##########        manual changes will be overwritten !!!              ##########
-##########        original file: https://3for.me/wdtuj                ##########
 ################################################################################
 SELINUX=<%= @sx_selinux_status %>