diff --git a/lib/util/installer.php b/lib/util/installer.php
index 9115ebdec4..01afa46d2b 100644
--- a/lib/util/installer.php
+++ b/lib/util/installer.php
@@ -454,6 +454,7 @@ abstract class Installer
"\$config['site']['server'] = {$vals['server']};\n" .
"\$config['site']['path'] = {$vals['path']}; \n\n" .
"\$config['site']['ssl'] = {$vals['ssl']}; \n\n" .
+ ($this->ssl === 'proxy' ? "\$config['site']['sslproxy'] = true;\n\n" : '') .
// checks if fancy URLs are enabled
($this->fancy ? "\$config['site']['fancy'] = true;\n\n" : '') .
diff --git a/public/install.php b/public/install.php
index 60e0e7362d..dd764420cd 100644
--- a/public/install.php
+++ b/public/install.php
@@ -206,6 +206,7 @@ class WebInstaller extends Installer
enable
disable
+ proxied
Enabling SSL (https://) requires extra webserver configuration and certificate generation not offered by this installation.
@@ -357,7 +358,7 @@ STR; $fail = true; } - if (!in_array($this->ssl, ['never', 'always'])) { + if (!in_array($this->ssl, ['never', 'always', 'proxy'])) { $this->updateStatus("Bad value for server SSL enabling."); $fail = true; } diff --git a/public/theme/base/css/display.css b/public/theme/base/css/display.css index cd909274da..393286faeb 100644 --- a/public/theme/base/css/display.css +++ b/public/theme/base/css/display.css @@ -1405,6 +1405,10 @@ form label.submit { margin-left:0; } +.form_settings label[for=ssl] { + margin-top:23px; +} + .form_settings label { margin-top:2px; width: 25%;