Merge branch 'master' of github.com:Froxlor/Froxlor

lib/configfiles/lucid.inc.php

@@ -36,7 +36,7 @@ if ($vmail_group === false) {
 
 return array(
 	'ubuntu_lucid' => array(
-		'label' => 'Ubuntu 10.04 (Lucid)',
+		'label' => 'Ubuntu 10.04 (Lucid) [deprecated]',
 		'services' => array(
 			'http' => array(
 				'label' => $lng['admin']['configfiles']['http'],

lib/configfiles/sle10.inc.php

@@ -36,7 +36,7 @@ if ($vmail_group === false) {
 
 return array(
 	'sle_10' => array(
-		'label' => 'SUSE Linux Enterprise 10',
+		'label' => 'SUSE Linux Enterprise 10 (deprecated)',
 		'services' => array(
 			'http' => array(
 				'label' => $lng['admin']['configfiles']['http'],

lib/configfiles/sle11.inc.php

@@ -35,8 +35,8 @@ if ($vmail_group === false) {
 }
 
 return array(
-	'opensuse_11_x' => array(
-		'label' => 'openSUSE 11.x',
+	'sle_11' => array(
+		'label' => 'SUSE Linux Enterprise 11',
 		'services' => array(
 			'http' => array(
 				'label' => $lng['admin']['configfiles']['http'],

lib/configfiles/squeeze.inc.php

@@ -36,7 +36,7 @@ if ($vmail_group === false) {
 
 return array(
 	'debian_squeeze' => array(
-		'label' => 'Debian 6.0 (Squeeze)',
+		'label' => 'Debian 6.0 (Squeeze) [deprecated]',
 		'services' => array(
 			'http' => array(
 				'label' => $lng['admin']['configfiles']['http'],

lib/configfiles/wheezy.inc.php

@@ -441,6 +441,9 @@ return array(
 							(Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'useradd -s /bin/false -g '.Settings::Get('phpfpm.vhost_httpgroup').' '.Settings::Get('phpfpm.vhost_httpuser') : null,
 							(Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'chown -R '.Settings::Get('phpfpm.vhost_httpuser').':'.Settings::Get('phpfpm.vhost_httpgroup').' '.FROXLOR_INSTALL_DIR : null,
 							(Settings::Get('phpfpm.enabled_ownvhost') == '1') ? 'a2dismod php5' : null
+						),
+						'restart' => array(
+							'/etc/init.d/apache2 restart'
 						)
 					)
 				)