Merge branch '6477-ipv6-only-webserver' into 'develop'

Till Brehm · Till Brehm · commit 7c43aab82bac · 2023-05-19T15:22:46.000Z
Resolve "IPv6 only web server"

Closes #6477

See merge request ispconfig/ispconfig3!1705
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
@@ -136,6 +136,10 @@ overquota_notify_onok=n
 logging=yes
 php_fpm_reload_mode=reload
 php_fpm_default_chroot=n
+vhost_proxy_protocol_enabled=n
+vhost_proxy_protocol_protocols=ipv4
+vhost_proxy_protocol_http_port=880
+vhost_proxy_protocol_https_port=8443
 
 [dns]
 bind_user=root
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
@@ -926,10 +926,24 @@
 		),
 		'vhost_proxy_protocol_enabled' => array (
 			'datatype' => 'VARCHAR',
-			'formtype' => 'CHECKBOX',
+			'formtype' => 'SELECT',
 			'default' => 'n',
-			'value' => array(0 => 'n',1 => 'y')
+			'value' => array(
+                'n' => 'Disabled',
+                'y' => 'Enabled (per site)',
+                'all' => 'Enabled (all sites)'
+            )
 		),
+        'vhost_proxy_protocol_protocols' => array(
+            'datatype' => 'VARCHAR',
+            'formtype' => 'SELECT',
+            'value' => array(
+                'ipv4' => 'IPv4',
+                'ipv6' => 'IPv6',
+                'ipv4,ipv6' => 'IPv4 + IPv6'
+            ),
+            'default' => 'ipv4'
+        ),
 		'vhost_proxy_protocol_http_port' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Habilitar protocolo PROXY';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'Porta HTTP protocolo PROXY';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'Porta HTTPS protocolo PROXY';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Gabarito authorized_keys Jailkit';
diff --git a/interface/web/admin/lib/lang/ca_server_config.lng b/interface/web/admin/lib/lang/ca_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys Template';
diff --git a/interface/web/admin/lib/lang/dk_server_config.lng b/interface/web/admin/lib/lang/dk_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
@@ -348,6 +348,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_hardlinks_txt'] = 'Hardlinks within Jailkit chroot';
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
@@ -332,6 +332,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) che Rspamd user
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password per Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password per Bayes Redis Server (lasciare vuoto se non usato).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Abilita protocollo PROXY';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'Porta HHTP per il protocollo PROXY';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'Porta HHTPS per il protocollo PROXY';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'modello Jailkit authorized_keys';
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -333,6 +333,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -330,6 +330,7 @@ $wb['tooltip_rspamd_redis_bayes_servers_txt'] = 'Redis server(s) which Rspamd wi
 $wb['rspamd_redis_bayes_password_txt'] = 'Redis Password for Bayes';
 $wb['tooltip_rspamd_redis_bayes_password_txt'] = 'Password for Bayes Redis Server (leave blank if unused).';
 $wb['vhost_proxy_protocol_enabled_txt'] = 'Enable PROXY Protocol';
+$wb['vhost_proxy_protocol_protocols_txt'] = 'Use PROXY Protocol on';
 $wb['vhost_proxy_protocol_http_port_txt'] = 'PROXY Protocol HTTP Port';
 $wb['vhost_proxy_protocol_https_port_txt'] = 'PROXY Protocol HTTPS Port';
 $wb['jailkit_chroot_authorized_keys_template_txt'] = 'Jailkit authorized_keys template';
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
@@ -54,7 +54,17 @@ <h4 class="panel-title">
         <div class="form-group">
             <label for="vhost_proxy_protocol_enabled" class="col-sm-3 control-label">{tmpl_var name='vhost_proxy_protocol_enabled_txt'}</label>
             <div class="col-sm-9">
-                {tmpl_var name='vhost_proxy_protocol_enabled'}
+                <select name="vhost_proxy_protocol_enabled" id="vhost_proxy_protocol_enabled" class="form-control">
+                    {tmpl_var name='vhost_proxy_protocol_enabled'}
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="vhost_proxy_protocol_protocols" class="col-sm-3 control-label">{tmpl_var name='vhost_proxy_protocol_protocols_txt'}</label>
+            <div class="col-sm-9">
+                <select name="vhost_proxy_protocol_protocols" id="vhost_proxy_protocol_protocols" class="form-control">
+                    {tmpl_var name='vhost_proxy_protocol_protocols'}
+                </select>
             </div>
         </div>
         <div class="form-group">
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
@@ -7,6 +7,11 @@ server {
 </tmpl_if>
 <tmpl_if name='ipv6_enabled'>
         listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='http_port'>;
+<tmpl_if name='use_proxy_protocol_ipv6' op='==' value='y'>
+<tmpl_if name='proxy_protocol_http' op='>' value='0'>
+        listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='proxy_protocol_http'> proxy_protocol;
+</tmpl_if>
+</tmpl_if>
 </tmpl_if>
 <tmpl_if name='ipv6_wildcard'>
         listen [::]:<tmpl_var name='http_port'>;
@@ -28,6 +33,11 @@ server {
 		# ssl_prefer_server_ciphers on;
 <tmpl_if name='ipv6_enabled'>
         listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='https_port'> ssl http2;
+<tmpl_if name='use_proxy_protocol_ipv6' op='==' value='y'>
+<tmpl_if name='proxy_protocol_https' op='>' value='0'>
+        listen [<tmpl_var name='ipv6_address'>]:<tmpl_var name='proxy_protocol_https'> ssl http2 proxy_protocol;
+</tmpl_if>
+</tmpl_if>
 </tmpl_if>
 <tmpl_if name='ipv6_wildcard'>
         listen [::]:<tmpl_var name='https_port'> ssl http2;
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
