diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 683a7bf..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,127 +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_alloy \
- -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 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 {
- sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
- 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_alloy.git
- git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
- push master --mirror
- '''
- }
- }
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/doc/_index.html b/doc/_index.html
index f3f32fd..1446a11 100644
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -122,6 +122,30 @@
+Defined Type Listing A-Z
+
+
+
+
diff --git a/doc/file.README.html b/doc/file.README.html
index 8bb0eaf..6fad3c7 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -132,6 +132,8 @@
All dependencies must be included in the catalogue.
Deployment
@@ -145,6 +147,13 @@
include confdroid_alloy
}
+
+External modules can add log files to Alloy’s path_targets list with the confdroid_alloy::log_targets defined type:
+
+confdroid_alloy::log_targets { 'my_application':
+ targets => ['/var/log/my_application/*.log', '/var/log/my_application/audit.log'],
+}
+
diff --git a/doc/index.html b/doc/index.html
index 4ae0a03..ed1ee6f 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -132,6 +132,8 @@
All dependencies must be included in the catalogue.
Deployment
@@ -145,6 +147,13 @@
include confdroid_alloy
}
+
+External modules can add log files to Alloy’s path_targets list with the confdroid_alloy::log_targets defined type:
+
+confdroid_alloy::log_targets { 'my_application':
+ targets => ['/var/log/my_application/*.log', '/var/log/my_application/audit.log'],
+}
+
diff --git a/doc/puppet_class_list.html b/doc/puppet_class_list.html
index b5058b5..f963215 100644
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -28,6 +28,10 @@
Puppet Classes
+
+ Defined Types
+
+
Search:
diff --git a/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html b/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html
index 2b78b30..8b9d618 100644
--- a/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html
+++ b/doc/puppet_classes/confdroid_alloy_3A_3Amain_3A_3Afiles.html
@@ -151,7 +151,26 @@
53
54
55
-56
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
# File 'manifests/main/files.pp', line 6
@@ -160,12 +179,12 @@ class confdroid_alloy::main::files (
) inherits confdroid_alloy::params {
require confdroid_alloy::main::dirs
+ include concat
- # Ensure log_targets is always an array
$log_targets_array = Array($confdroid_alloy::params::ay_log_targets, true)
- file { $ay_main_file:
- ensure => file,
+ concat { $ay_main_file:
+ ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
@@ -173,10 +192,29 @@ class confdroid_alloy::main::files (
selrole => object_r,
seltype => etc_t,
seluser => system_u,
- content => template('confdroid_alloy/config.alloy.erb'),
notify => Service[$ay_service],
}
+ concat::fragment { 'confdroid_alloy_config_header':
+ target => $ay_main_file,
+ content => template('confdroid_alloy/config.alloy.erb'),
+ order => '001',
+ }
+
+ if $ay_manage_loki == true {
+ concat::fragment { 'confdroid_alloy_log_targets_default':
+ target => $ay_main_file,
+ content => template('confdroid_alloy/log_targets.alloy.erb'),
+ order => '010',
+ }
+ }
+
+ concat::fragment { 'confdroid_alloy_config_tail':
+ target => $ay_main_file,
+ content => template('confdroid_alloy/config.alloy.tail.erb'),
+ order => '999',
+ }
+
# manage logrotate for rsyslog to allow adm group membership
file { '/etc/logrotate.d/rsyslog':
ensure => file,
diff --git a/doc/puppet_defined_type_list.html b/doc/puppet_defined_type_list.html
new file mode 100644
index 0000000..73fb0fb
--- /dev/null
+++ b/doc/puppet_defined_type_list.html
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defined Type List
+
+
+
+
+
+
diff --git a/doc/puppet_defined_types/confdroid_alloy_3A_3Alog_targets.html b/doc/puppet_defined_types/confdroid_alloy_3A_3Alog_targets.html
new file mode 100644
index 0000000..21a18ed
--- /dev/null
+++ b/doc/puppet_defined_types/confdroid_alloy_3A_3Alog_targets.html
@@ -0,0 +1,165 @@
+
+
+
+
+
+
+ Defined Type: confdroid_alloy::log_targets
+
+ — Documentation by YARD 0.9.36
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Defined Type: confdroid_alloy::log_targets
+
+
+ - Defined in:
+ -
+ manifests/log_targets.pp
+
+
+
+
+ Summary
+ Adds log file targets to the Alloy configuration.
+
+ Overview
+
+
+
+ confdroid_alloy::log_targets.pp Module name: confdroid_alloy
+
+
+
+
+
+
+
+
+
+
+
+
+
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+ |
+
+ # File 'manifests/log_targets.pp', line 6
+
+define confdroid_alloy::log_targets (
+
+ Array[String] $targets = [],
+
+) {
+ if $confdroid_alloy::params::ay_manage_loki == true and $targets != [] {
+ $log_targets_array = $targets
+
+ concat::fragment { "log_targets_${name}":
+ target => $confdroid_alloy::params::ay_main_file,
+ content => template('confdroid_alloy/log_targets.alloy.erb'),
+ order => '020',
+ }
+ }
+}
+ |
+
+
+
+
+
+
+
+ |