OP#419 finalize module

OP#419 initial commit after changes
2026-02-07 16:05:57 +01:00 · 2026-02-07 16:01:48 +01:00 · 2026-02-07 13:34:25 +01:00 · 2025-06-06 17:27:21 +02:00 · 2025-05-22 18:31:18 +02:00
9 changed files with 140 additions and 59 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,32 @@
 Gemfile.lock
 FileList
 .scannerwork
+.vscode
+.idea
+*.log
+*.tmp
+*.swp
+*.swo
+*.bak
+*.backup
+*.orig
+*.rej
+*.sublime-project
+*.sublime-workspace
+.DS_Store
+Thumbs.db
+*.gem
+*.rbc
+.bundle
+vendor/bundle
+vendor/cache
+vendor/gems
+vendor/ruby
+log/*
+tmp/*
+!.keep
+coverage/*
+spec/reports/*
+test/reports/*
+doc/*
+pkg/*
--- a/74
+++ b/74
@@ -1,7 +1,5 @@
 pipeline {
-    agent {
-      label 'puppet'
-    }
+    agent any

    post {
        always {
@@ -25,10 +23,16 @@ pipeline {
      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 pull origin master
-                  git checkout -b jenkins '''
+            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; }
+            '''
        }
      }
    }
@@ -53,20 +57,23 @@ pipeline {
        steps {
          sh '''/usr/local/bin/puppet-lint . \\
                --no-variable_scope-check \\
+                || { echo "Puppet lint failed"; exit 1; }
            '''
          }
        }

      stage('SonarScan') {
         steps {
-             sh '''
-             /opt/sonar-scanner/bin/sonar-scanner \
-              -Dsonar.projectKey=php_cd \
-              -Dsonar.sources=. \
-              -Dsonar.host.url=https://sonarqube.confdroid.com \
-              -Dsonar.token=sqa_aca21cc41336d0f31987ed196ccfb9be55ded774
-              '''
-             }
+            withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
+              sh '''
+              /opt/sonar-scanner/bin/sonar-scanner \
+                -Dsonar.projectKey=confdroid_php \
+                -Dsonar.sources=. \
+                -Dsonar.host.url=https://sonarqube.confdroid.com \
+                -Dsonar.token=$SONAR_TOKEN
+                '''
+              }
+            }
          }

      stage('create Puppet documentation') {
@@ -78,12 +85,39 @@ pipeline {
      stage('update repo') {
        steps {
          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''git config user.name "Jenkins Server"
-                  git config user.email jenkins@confdroid.com
-                  echo `git add -A && git commit -am "recommit for updates in build $BUILD_NUMBER"`
-                  git push origin HEAD:master'''
+            sh '''
+                git config user.name "Jenkins Server"
+                git config user.email jenkins@confdroid.com
+                git rm -r --cached .vscode || echo "No .vscode to remove from git"
+                git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
+                git push origin HEAD:master
+            '''
+        }
+      }
+    }
+      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_php.git
+                  git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
+                  push master --mirror
+                  '''
+          }
        }
      }
    }
  }
-}
+}
--- a/README.md
+++ b/README.md
@@ -1,14 +1,27 @@
 # Readme

-[![Build Status](https://pipelines.confdroid.com/buildStatus/icon?job=php_cd)](https://pipelines.confdroid.com/job/php_cd/)|
+[![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_php)](https://jenkins.confdroid.com/job/confdroid_php/)
+[![Quality Gate Status](https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_php&metric=alert_status&token=sqb_29de35ae9b31f21d0df8559554ea93a9856358b7)](https://sonarqube.confdroid.com/dashboard?id=confdroid_php)
+[![Security Hotspots](https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_php&metric=security_hotspots&token=sqb_29de35ae9b31f21d0df8559554ea93a9856358b7)](https://sonarqube.confdroid.com/dashboard?id=confdroid_php)
+
+
+- [Readme](#readme)
+  - [Synopsis](#synopsis)
+  - [WARNING](#warning)
+  - [Features](#features)
+  - [Support](#support)
+- [Parameter Inheritance](#parameter-inheritance)
+  - [Module Deployment](#module-deployment)
+  - [Tests](#tests)
+  - [Contact Us](#contact-us)
+  - [Disclaimer](#disclaimer)

-[[_TOC_]]

 ## Synopsis

 Php is a widely used open source scripting language for web services.

-`php_cd` manages php installations for use with other modules like `wordpress_cd`
+`confdroid_php` manages plain php installations for use with other modules like `confdroid_nagios`. PHP is installed and properly configured to allow multiple applications with different settings to run in parallel. Custom php.ini settings should be configured with the application in question.

 ## WARNING

@@ -16,6 +29,11 @@ Php is a widely used open source scripting language for web services.

 ## Features

+- install php
+- manage required directories including selinux contexts and permissions
+- manage reuired files including selinux contexts and permissions
+
+
 ## Support

 * Rocky 9
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,8 +1,8 @@
-## php_cd::init.pp
-# Module name: php_cd
-# Author: Arne Teuke (arne_teuke@confdroid.com)
-# @summary Class initializes the php_cd module
+## confdroid_php::init.pp
+# Module name: confdroid_php
+# Author: 12ww1160 (12ww1160@confdroid.com)
+# @summary Class initializes the confdroid_php module
 ##############################################################################
-class php_cd {
-  include php_cd::params
+class confdroid_php {
+  include confdroid_php::params
 }
--- a/manifests/main/config.pp
+++ b/manifests/main/config.pp
@@ -1,10 +1,10 @@
-## php_cd::main::config.pp
-# Module name: php_cd
-# Author: Arne Teuke (arne_teuke@confdroid.com)
+## confdroid_php::main::config.pp
+# Module name: confdroid_php
+# Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary Class manages the module logic
 ##############################################################################
-class php_cd::main::config (
+class confdroid_php::main::config (

-) inherits php_cd::params {
-  include php_cd::main::files
+) inherits confdroid_php::params {
+  include confdroid_php::main::files
 }
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -1,12 +1,12 @@
-## php_cd::main::dirs.pp
-# Module name: php_cd
-# Author: Arne Teuke (arne_teuke@confdroid.com)
+## confdroid_php::main::dirs.pp
+# Module name: confdroid_php
+# Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary Class manages directory structure
 ##############################################################################
-class php_cd::main::dirs (
+class confdroid_php::main::dirs (

-) inherits php_cd::params {
-  require php_cd::main::install
+) inherits confdroid_php::params {
+  require confdroid_php::main::install

  file { $php_lib_dir:
    ensure   => directory,
--- a/manifests/main/files.pp
+++ b/manifests/main/files.pp
@@ -1,12 +1,12 @@
-## php_cd::main::files.pp
-# Module name: php_cd
-# Author: Arne Teuke (arne_teuke@confdroid.com)
+## confdroid_php::main::files.pp
+# Module name: confdroid_php
+# Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary Class manages file aspects
 ##############################################################################
-class php_cd::main::files (
+class confdroid_php::main::files (

-) inherits php_cd::params {
-  require  php_cd::main::dirs
+) inherits confdroid_php::params {
+  require  confdroid_php::main::dirs

  file { $php_ini_file:
    ensure   => file,
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -1,11 +1,11 @@
-## php_cd::main::install.pp
-# Module name: php_cd
-# Author: Arne Teuke (arne_teuke@confdroid.com)
+## confdroid_php::main::install.pp
+# Module name: confdroid_php
+# Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary Class manages installation aspects
 ##############################################################################
-class php_cd::main::install (
+class confdroid_php::main::install (

-) inherits php_cd::params {
+) inherits confdroid_php::params {
  package { $reqpackages:
    ensure => $pkg_ensure,
  }
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,14 +1,14 @@
-## php_cd::params.pp
-# Module name: php_cd
-# Author: Arne Teuke (arne_teuke@confdroid.com)
+## confdroid_php::params.pp
+# Module name: confdroid_php
+# Author: 12ww1160 (12ww1160@confdroid.com)
 # @summary Class contains all class parameters for this module
 # @param [String] reqpackages which packages to install
 # @param [String] pkg_ensure which version of packages to install
 ##############################################################################
-class php_cd::params (
+class confdroid_php::params (

  String $reqpackages = 'php',
-  String $pkg_ensure  = 'latest',
+  String $pkg_ensure  = 'present',

 ) {
 # Facts
@@ -26,8 +26,8 @@ class php_cd::params (

 # Files
  $php_ini_file       = '/etc/php.ini'
-  $php_ini_erb        = 'php_cd/php.ini.erb'
+  $php_ini_erb        = 'confdroid_php/php.ini.erb'

  # includes must be last
-  include php_cd::main::config
+  include confdroid_php::main::config
 }
Author	SHA1	Message	Date
12ww1160	3eed4ba4fe	OP#419 finalize module	2026-02-07 16:05:57 +01:00
12ww1160	1af997a6d5	OP#419 finalize module	2026-02-07 16:01:48 +01:00
12ww1160	adbced0d81	OP#419 initial commit after changes	2026-02-07 13:34:25 +01:00
Arne Teuke	7d84294e7d	add new MR approach	2025-06-06 17:27:21 +02:00
Arne Teuke	a923dadb8d	fix build info and Jenkins pipeline	2025-05-22 18:31:18 +02:00