make #6471 backwards compatible by keeping the old variable

Author: Andreas Palm

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

@@ -1341,7 +1341,8 @@ function update($event_name, $data) {
 		$vhost_data['custom_sendmail_path'] = (isset($custom_sendmail_path) && $custom_sendmail_path) ? 'y' : 'n';
 
 		$tpl->setVar($vhost_data);
-		$tpl->setVar('apache_version', $app->system->getapacheversion(true));
+		$tpl->setVar('apache_version', $app->system->getapacheversion());
+		$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
 
 		// Rewrite rules
 		$rewrite_rules = array();