fix log4j

Author: h-haaks

REFERENCE.md

@@ -129,9 +129,9 @@ The following parameters are available in the `elasticsearch` class:
 * [`license`](#-elasticsearch--license)
 * [`logdir`](#-elasticsearch--logdir)
 * [`logdir_mode`](#-elasticsearch--logdir_mode)
+* [`logging_content`](#-elasticsearch--logging_content)
 * [`manage_datadir`](#-elasticsearch--manage_datadir)
 * [`manage_logdir`](#-elasticsearch--manage_logdir)
-* [`manage_logging`](#-elasticsearch--manage_logging)
 * [`manage_repo`](#-elasticsearch--manage_repo)
 * [`oss`](#-elasticsearch--oss)
 * [`package_dir`](#-elasticsearch--package_dir)
@@ -399,6 +399,14 @@ Mode directory that will be used for Elasticsearch logging (default 2750).
 
 Default value: `'2750'`
 
+##### <a name="-elasticsearch--logging_content"></a>`logging_content`
+
+Data type: `Optional[Variant[String, Array]]`
+
+Content to use for the logging configuration file (log4j2.properties).
+
+Default value: `undef`
+
 ##### <a name="-elasticsearch--manage_datadir"></a>`manage_datadir`
 
 Data type: `Boolean`
@@ -411,14 +419,6 @@ Data type: `Boolean`
 
 Enable logdir management (default true).
 
-##### <a name="-elasticsearch--manage_logging"></a>`manage_logging`
-
-Data type: `Boolean`
-
-Enable logging (log4j) management (default false).
-
-Default value: `false`
-
 ##### <a name="-elasticsearch--manage_repo"></a>`manage_repo`
 
 Data type: `Boolean`

manifests/config.pp

@@ -142,16 +142,20 @@
     }
 
     # Logging file
-    if $elasticsearch::manage_logging and !empty($elasticsearch::logging_content) {
-      file { $elasticsearch::logging_path:
+    if ! ($elasticsearch::logging_content =~ Undef) {
+      if $elasticsearch::logging_content =~ Array {
+        $_log4j_content = $elasticsearch::logging_content.join("\n")
+      } else {
+        $_log4j_content = $elasticsearch::logging_content
+      }
+      file { "${elasticsearch::configdir}/log4j2.properties":
         ensure  => file,
-        content => $elasticsearch::logging_content,
-        group   => $elasticsearch::elasticsearch_group,
-        owner   => $elasticsearch::elasticsearch_user,
-        mode    => '0644',
+        content => $_log4j_content,
         notify  => $elasticsearch::_notify_service,
-        require => File[$elasticsearch::configdir],
-        before  => Class['elasticsearch::service'],
+        require => Class['elasticsearch::package'],
+        owner   => 'root',
+        group   => $elasticsearch::elasticsearch_group,
+        mode    => '0640',
       }
     }
 
@@ -164,9 +168,9 @@
       content => template("${module_name}/etc/elasticsearch/elasticsearch.yml.erb"),
       notify  => $elasticsearch::_notify_service,
       require => Class['elasticsearch::package'],
-      owner   => $elasticsearch::elasticsearch_user,
+      owner   => 'root',
       group   => $elasticsearch::elasticsearch_group,
-      mode    => '0440',
+      mode    => '0640',
     }
 
     file { "${elasticsearch::configdir}/jvm.options":

manifests/init.pp

@@ -133,15 +133,15 @@
 # @param logdir_mode
 #   Mode directory that will be used for Elasticsearch logging (default 2750).
 #
+# @param logging_content
+#   Content to use for the logging configuration file (log4j2.properties).
+#
 # @param manage_datadir
 #   Enable datadir management (default true).
 #
 # @param manage_logdir
 #   Enable logdir management (default true).
 #
-# @param manage_logging
-#   Enable logging (log4j) management (default false).
-#
 # @param manage_repo
 #   Enable repo management by enabling official Elastic repositories.
 #
@@ -378,9 +378,7 @@
   Optional[String]                                $keystore_password         = undef,
   Optional[Stdlib::Absolutepath]                  $keystore_path             = undef,
   Stdlib::Filemode                                $logdir_mode               = '2750',
-  Optional[String]                                $logging_content           = undef,
-  Stdlib::Absolutepath                            $logging_path              = "${configdir}/log4j2.properties",
-  Boolean                                         $manage_logging            = false,
+  Optional[Variant[String, Array]]                $logging_content           = undef,
   Boolean                                         $package_hold              = false,
   Optional[Stdlib::Absolutepath]                  $private_key               = undef,
   Enum['rsa','dsa','ec']                          $private_key_type          = 'rsa',

spec/classes/000_elasticsearch_init_spec.rb

@@ -79,6 +79,8 @@
         }
       end
 
+      it { expect(subject).not_to contain_file('/etc/elasticsearch/log4j2.properties') }
+
       context 'java installation' do
         let(:pre_condition) do
           <<-MANIFEST
@@ -346,6 +348,35 @@
           expect(subject).not_to contain_file('/var/log/elasticsearch-log')
         }
       end
+
+      context 'When using custom logging_content String' do
+        let(:params) do
+          default_params.merge(
+            logging_content: '# Content'
+          )
+        end
+
+        it {
+          expect(subject).to contain_file('/etc/elasticsearch/log4j2.properties').
+            with(ensure: 'file', content: '# Content')
+        }
+      end
+
+      context 'When using custom logging_content Array' do
+        let(:params) do
+          default_params.merge(
+            logging_content: [
+              '# Content Line 1',
+              '# Content Line 2',
+            ]
+          )
+        end
+
+        it {
+          expect(subject).to contain_file('/etc/elasticsearch/log4j2.properties').
+            with(ensure: 'file', content: "# Content Line 1\n# Content Line 2")
+        }
+      end
     end
   end
   # rubocop:enable RSpec/MultipleMemoizedHelpers
@@ -528,59 +559,6 @@
         }
       end
 
-      context 'When managing the logging file (with content)' do
-        let(:params) do
-          default_params.merge(
-            logging_content: '# Content',
-            manage_logging: true
-          )
-        end
-
-        it {
-          expect(subject).to contain_file('/etc/elasticsearch/log4j2.properties').
-            with(ensure: 'file', content: '# Content')
-        }
-      end
-
-      context 'When managing the logging file (with content and specific path)' do
-        let(:params) do
-          default_params.merge(
-            logging_content: '# Content',
-            logging_path: '/etc/elasticsearch/log4j.properties',
-            manage_logging: true
-          )
-        end
-
-        it {
-          expect(subject).to contain_file('/etc/elasticsearch/log4j.properties').
-            with(ensure: 'file', content: '# Content')
-        }
-      end
-
-      context 'When managing the logging file (with no content)' do
-        let(:params) do
-          default_params.merge(
-            manage_logging: true
-          )
-        end
-
-        it {
-          expect(subject).not_to contain_file('/etc/elasticsearch/log4j2.properties')
-        }
-      end
-
-      context 'When not managing the logging file' do
-        let(:params) do
-          default_params.merge(
-            manage_logging: false
-          )
-        end
-
-        it {
-          expect(subject).not_to contain_file('/etc/elasticsearch/log4j2.properties')
-        }
-      end
-
       context 'with restart_on_change => true' do
         let(:params) do
           default_params.merge(