Merge pull request #1177 from RotherOSS/issue-#1175-Perl_5.34.0

Issue #1175 perl 5.34.0
RotherOSS · Aug 13, 2021 · 4c0e71a · 4c0e71a
2 parents e24932a + 30dd765
commit 4c0e71a
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 29 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -720,4 +720,3 @@
 
 # OTOBO 10.0.0 beta1 2020-01-30
  - First official OTOBO release, yippie!
-
diff --git a/Kernel/Language/de.pm b/Kernel/Language/de.pm
@@ -6222,7 +6222,7 @@ Thanks for your help!
 ' => '
 Sehr geehrter Kunde,
 
-leider enthält der von Ihnen verwendete Betreff keine gültige Ticketnummer, 
+leider enthält der von Ihnen verwendete Betreff keine gültige Ticketnummer,
 so dass diese E-Mail nicht automatisch verarbeitet werden kann.
 
 Bitte erstellen Sie ein neues Ticket im Kundenbereich.

diff --git a/Kernel/System/Console/Command/Maint/Elasticsearch/Migration.pm b/Kernel/System/Console/Command/Maint/Elasticsearch/Migration.pm
@@ -145,9 +145,9 @@ sub Run {
 
     if ( $Targets =~ /u/ ) {
         $Self->MigrateCustomerUsers(
-            ESObject => $ESObject,
-            Config   => $Config->{CustomerUser} || $Config->{all},
-            Sleep    => $MicroSleep,
+            ESObject   => $ESObject,
+            Config     => $Config->{CustomerUser} || $Config->{all},
+            Sleep      => $MicroSleep,
             LimitLevel => $CustomerLimitLevel
         );
     }

diff --git a/otobo.nginx.dockerfile b/otobo.nginx.dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update\
  "screen"\
  "tree"\
  "vim"\
+ "certbot"\
  && rm -rf /var/lib/apt/lists/*
 
 # No need to run on the low ports 80 and 443,

diff --git a/otobo.web.dockerfile b/otobo.web.dockerfile
@@ -3,10 +3,11 @@
 # See also bin/docker/build_docker_images.sh
 # See also https://doc.otobo.org/manual/installation/stable/en/content/installation-docker.html
 
-# Use the latest Perl as of 2021-06-12.
+# Use the latest maintainance release of the Perl 5.34.x series.
+# Perl 5.34.0 was released 2021-05-20. As of 2021-08-13 there are no maintenance releases.
 # This image is based on Debian 10 (Buster). The user is root.
 # The Perl module installer 'cpanm' is already installed.
-FROM perl:5.34.0-buster
+FROM perl:5.34-buster
 
 # Some initial setup that needs to be done by root.
 USER root

diff --git a/scripts/test/Elasticsearch/IndexSetting.t b/scripts/test/Elasticsearch/IndexSetting.t
@@ -26,7 +26,7 @@ use vars (qw($Self));
 # get helper object
 $Kernel::OM->ObjectParamAdd(
     'Kernel::System::UnitTest::Helper' => {
-        RestoreDatabase  => 1,
+        RestoreDatabase => 1,
     },
 );
 my $Helper = $Kernel::OM->Get('Kernel::System::UnitTest::Helper');
@@ -35,48 +35,57 @@ my $MigObject = $Kernel::OM->Get('Kernel::System::Console::Command::Maint::Elast
 
 my $Index1 = $MigObject->_IndexSettingsGet(
     Config => {
-        NS => 5,
-        NR => 10,
+        NS          => 5,
+        NR          => 10,
         FieldsLimit => 1000,
-    });
+    }
+);
 
 $Self->Is(
     $Index1->{index}->{number_of_shards}, 5,
-    '#1 number_of_shards');
+    '#1 number_of_shards'
+);
 $Self->Is(
     $Index1->{index}->{number_of_replicas}, 10,
-    '#1 number_of_replicas');
+    '#1 number_of_replicas'
+);
 $Self->Is(
     $Index1->{'index.mapping.total_fields.limit'}, 1000,
-    '#1 index.mapping.total_fields.limit');
+    '#1 index.mapping.total_fields.limit'
+);
 
 # When admin changes Elasticsearch::ArticleIndexCreationSettings, FieldsLimit is missing
 my $Index2 = $MigObject->_IndexSettingsGet(
     Config => {
         NS => 5,
         NR => 10,
-    });
+    }
+);
 $Self->Is(
     $Index2->{'index.mapping.total_fields.limit'}, 2000,
-    '#2 index.mapping.total_fields.limit');
+    '#2 index.mapping.total_fields.limit'
+);
 
 # Expansion test
 my $Data = {
     index => {
         number_of_shards   => 'XXX[% Data.NS |uri %]XXX',
         number_of_replicas => '[% Data.NR |uri %]',
-        scalar => {
+        scalar             => {
             number  => 123,
             string  => '456',
             nullval => undef,
             zero    => 0,
         },
-        empty => {},
+        empty     => {},
         arraytest => {
-            array => ['abc', 'def', 'ghi'],
+            array  => [ 'abc', 'def', 'ghi' ],
             nested => [
                 { value1 => 123 },
-                { value2 => 456, value3 => 789},
+                {
+                    value2 => 456,
+                    value3 => 789
+                },
             ],
             empty => [],
         },
@@ -85,7 +94,7 @@ my $Data = {
 };
 
 my $Expanded = $MigObject->_ExpandTemplate(
-    Item => $Data,
+    Item   => $Data,
     Config => {
         NS => 0,
         NR => 1,
@@ -99,35 +108,35 @@ $Self->Is(
 );
 
 $Self->Is(
-    $Expanded->{index}->{scalar}->{number}, 123, 
+    $Expanded->{index}->{scalar}->{number}, 123,
     '#4 expand scalar-number',
 );
 $Self->Is(
-    $Expanded->{index}->{scalar}->{string}, '456', 
+    $Expanded->{index}->{scalar}->{string}, '456',
     '#4 expand scalar-string',
 );
 $Self->Is(
-    $Expanded->{index}->{scalar}->{nullval}, undef, 
+    $Expanded->{index}->{scalar}->{nullval}, undef,
     '#4 expand scalar-nullval',
 );
 $Self->Is(
-    $Expanded->{index}->{scalar}->{zero}, 0, 
+    $Expanded->{index}->{scalar}->{zero}, 0,
     '#4 expand scalar-zero',
 );
 $Self->Is(
-    ref $Expanded->{index}->{empty}, 'HASH', 
+    ref $Expanded->{index}->{empty}, 'HASH',
     '#4 expand index-empty',
 );
 $Self->Is(
-    $Expanded->{index}->{arraytest}->{array}->[2], 'ghi', 
+    $Expanded->{index}->{arraytest}->{array}->[2], 'ghi',
     '#4 expand index-arraytest-array',
 );
 $Self->Is(
-    $Expanded->{index}->{arraytest}->{nested}->[1]->{value3}, 789, 
+    $Expanded->{index}->{arraytest}->{nested}->[1]->{value3}, 789,
     '#4 expand index-arraytest-array',
 );
 $Self->Is(
-    ref $Expanded->{index}->{arraytest}->{empty}, 'ARRAY', 
+    ref $Expanded->{index}->{arraytest}->{empty}, 'ARRAY',
     '#4 expand index-arraytest-empty',
 );