Issue #138: adapt the scheme of the start URL

RotherOSS · Jul 6, 2020 · e17396c · e17396c
1 parent fe722f5
commit e17396c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/Kernel/Modules/Installer.pm b/Kernel/Modules/Installer.pm
@@ -1014,12 +1014,13 @@ sub Run {
         $LayoutObject->Block(
             Name => 'Finish',
             Data => {
-                Item       => Translatable('Finished'),
-                Step       => $StepCounter,
-                Host       => $ENV{HTTP_HOST} || $ConfigObject->Get('FQDN'),
+                Item        => Translatable('Finished'),
+                Step        => $StepCounter,
+                Host        => $ENV{HTTP_HOST} || $ConfigObject->Get('FQDN'),
+                Scheme      => ( ($ENV{HTTPS} && $ENV{HTTPS} eq 'ON') ? 'https' : 'http' ),
                 OTOBOHandle => $OTOBOHandle,
-                Webserver  => $Webserver,
-                Password   => $Password,
+                Webserver   => $Webserver,
+                Password    => $Password,
             },
         );
         if ($Webserver) {

diff --git a/Kernel/Output/HTML/Templates/Standard/InstallerFinish.tt b/Kernel/Output/HTML/Templates/Standard/InstallerFinish.tt
@@ -47,8 +47,8 @@
 [% RenderBlockEnd("Restart") %]
                     <label>[% Translate("Start page") | html %]:</label>
                     <div class="Field">
-                        <a href="http://[% Data.Host | html %]/[% Data.OTOBOHandle %]/index.pl">
-                            http://[% Data.Host | html %]/[% Data.OTOBOHandle %]/index.pl
+                        <a href="[% Data.Scheme || 'http' %]://[% Data.Host | html %]/[% Data.OTOBOHandle %]/index.pl">
+                            [% Data.Scheme || 'http' %]://[% Data.Host | html %]/[% Data.OTOBOHandle %]/index.pl
                         </a>
                     </div>
                     <div class="Clear"></div>