CC-3015: Upgrade: upgrade fails

-small fixes to template
This commit is contained in:
Martin Konecny 2011-11-03 15:16:36 -04:00
parent 9e5bcfb24b
commit d1c3563451
4 changed files with 13 additions and 13 deletions

View file

@ -16,6 +16,8 @@ class UpgradeCommon{
const CONF_PYPO_GRP = "pypo";
const CONF_WWW_DATA_GRP = "www-data";
const CONF_BACKUP_SUFFIX = "200";
const VERSION_NUMBER = "2.0";
public static function connectToDatabase($p_exitOnError = true)
{
@ -84,7 +86,7 @@ class UpgradeCommon{
UpgradeCommon::CONF_FILE_API_CLIENT);
// Backup the config files
$suffix = date("Ymdhis")."-".VERSION_NUMBER;
$suffix = date("Ymdhis")."-".UpgradeCommon::VERSION_NUMBER;
foreach ($configFiles as $conf) {
// do not back up monit cfg
if (file_exists($conf)) {
@ -94,8 +96,7 @@ class UpgradeCommon{
}
}
$default_suffix = "200";
self::CreateIniFiles($default_suffix);
self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX);
self::MergeConfigFiles($configFiles, $suffix);
}