Merge branch '6471-use-mod-remoteip-in-new-apache-versions' into 'develop'

Include minor number in apache version for vhost.conf.master, #6471

Closes #6471

See merge request ispconfig/ispconfig3!1700

Author: Till Brehm

server/conf/vhost.conf.master

@@ -13,7 +13,7 @@
 <tmpl_loop name='vhosts'>
 <VirtualHost {tmpl_var name='ip_address'}:{tmpl_var name='port'}>
 <tmpl_if name='use_proxy_protocol' op='==' value='y'>
-<tmpl_if name='apache_version' op='>=' value='2.4.30' format='version'>
+<tmpl_if name='apache_full_version' op='>=' value='2.4.30' format='version'>
 	<IfModule mod_remoteip.c>
 		RemoteIPProxyProtocol On
 	</IfModule>

server/plugins-available/apache2_plugin.inc.php

@@ -1342,6 +1342,7 @@ function update($event_name, $data) {
 
 		$tpl->setVar($vhost_data);
 		$tpl->setVar('apache_version', $app->system->getapacheversion());
+		$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
 
 		// Rewrite rules
 		$rewrite_rules = array();