From 4f5186f97c44b9ca2c2cff27276f6011a4330e3a Mon Sep 17 00:00:00 2001
From: "Florian Aders (EleRas)" <eleras@froxlor.org>
Date: Wed, 23 May 2012 09:17:16 +0200
Subject: [PATCH] Corrected updater too Froxlor standards, fixes #1089

Signed-off-by: Florian Aders (EleRas) <eleras@froxlor.org>
---
 install/froxlor.sql                            | 3 ++-
 install/updates/froxlor/0.9/update_0.9.inc.php | 6 +++---
 lib/tables.inc.php                             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/install/froxlor.sql b/install/froxlor.sql
index 80021824..2a8df7f1 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -469,7 +469,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.27');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.28-svn1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');
@@ -618,6 +618,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfp
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'vhost_httpuser', 'froxlorlocal');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'vhost_httpgroup', 'froxlorlocal');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'idle_timeout', '30');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_enable', '1');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_webmax', '90');
 INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'report_trafficmax', '90');
diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php
index ea403c8e..0cf4a5c2 100644
--- a/install/updates/froxlor/0.9/update_0.9.inc.php
+++ b/install/updates/froxlor/0.9/update_0.9.inc.php
@@ -1822,8 +1822,8 @@ if(isFroxlorVersion('0.9.27-rc1'))
 }
 
 if(isFroxlorVersion('0.9.27')) {
-  showUpdateStep("Updating from 0.9.27 to 0.9.28-fpmfix");
-  lastStepStatus(0);
+	showUpdateStep("Updating from 0.9.27 to 0.9.28-svn1");
+	lastStepStatus(0);
 
 	// Get AliasconfigDir setting if available
 	$handle = $db->query("SELECT `value` FROM `panel_settings` WHERE `settinggroup` = 'phpfpm' AND `varname` = 'aliasconfigdir';");
@@ -1833,5 +1833,5 @@ if(isFroxlorVersion('0.9.27')) {
 		$db->query("INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('phpfpm', 'aliasconfigdir', '/var/www/php-fpm/');");
 	}
 
- 	updateToVersion('0.9.28-fpmfix');
+ 	updateToVersion('0.9.28-svn1');
 }
diff --git a/lib/tables.inc.php b/lib/tables.inc.php
index 17107128..14e80f51 100644
--- a/lib/tables.inc.php
+++ b/lib/tables.inc.php
@@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2);
 
 // VERSION INFO
 
-$version = '0.9.27';
+$version = '0.9.28-svn1';
 $dbversion = '2';
 $branding = '';