schema.php (fogproject-1.5.7) | : | schema.php (fogproject-1.5.8) | ||
---|---|---|---|---|
skipping to change at line 754 | skipping to change at line 754 | |||
. "INDEX `new_index2`(`pInstalled`)," | . "INDEX `new_index2`(`pInstalled`)," | |||
. "INDEX `new_index3`(`pVersion`)" | . "INDEX `new_index3`(`pVersion`)" | |||
. ') ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC' , | . ') ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC' , | |||
"ALTER TABLE `hosts` CHANGE `hostAnon3` `hostKernel` VARCHAR(250) " | "ALTER TABLE `hosts` CHANGE `hostAnon3` `hostKernel` VARCHAR(250) " | |||
. "CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL," | . "CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL," | |||
. "CHANGE `hostAnon4` `hostDevice` VARCHAR(250) CHARACTER " | . "CHANGE `hostAnon4` `hostDevice` VARCHAR(250) CHARACTER " | |||
. "SET utf8 COLLATE utf8_general_ci NOT NULL", | . "SET utf8 COLLATE utf8_general_ci NOT NULL", | |||
"UPDATE `schemaVersion` set vValue = '15'", | "UPDATE `schemaVersion` set vValue = '15'", | |||
); | ); | |||
// 16 | // 16 | |||
$fogstoragenodeuser = "fogstorage"; | ||||
$fogstoragenodepass = "fs".rand(1000, 100000000000); | ||||
$this->schema[] = array( | $this->schema[] = array( | |||
"ALTER TABLE `tasks` ADD COLUMN `taskBPM` varchar(250) NOT NULL AFTER " | "ALTER TABLE `tasks` ADD COLUMN `taskBPM` varchar(250) NOT NULL AFTER " | |||
. "`taskPCT`, ADD COLUMN `taskTimeElapsed` varchar(250) NOT NULL AFTER " | . "`taskPCT`, ADD COLUMN `taskTimeElapsed` varchar(250) NOT NULL AFTER " | |||
. "`taskBPM`, ADD COLUMN `taskTimeRemaining` varchar(250) NOT NULL AFTER " | . "`taskBPM`, ADD COLUMN `taskTimeRemaining` varchar(250) NOT NULL AFTER " | |||
. "`taskTimeElapsed`, ADD COLUMN `taskDataCopied` varchar(250) NOT NULL " | . "`taskTimeElapsed`, ADD COLUMN `taskDataCopied` varchar(250) NOT NULL " | |||
. "AFTER `taskTimeRemaining`, ADD COLUMN `taskPercentText` varchar(250) NOT " | . "AFTER `taskTimeRemaining`, ADD COLUMN `taskPercentText` varchar(250) NOT " | |||
. "NULL AFTER `taskDataCopied`, ADD COLUMN `taskDataTotal` VARCHAR(250) NOT " | . "NULL AFTER `taskDataCopied`, ADD COLUMN `taskDataTotal` VARCHAR(250) NOT " | |||
. "NULL AFTER `taskPercentText`", | . "NULL AFTER `taskPercentText`", | |||
"CREATE TABLE `nfsGroups` (" | "CREATE TABLE `nfsGroups` (" | |||
. "`ngID` integer NOT NULL AUTO_INCREMENT," | . "`ngID` integer NOT NULL AUTO_INCREMENT," | |||
skipping to change at line 844 | skipping to change at line 842 | |||
. "')", | . "')", | |||
"UPDATE `images` set imageNFSGroupID = '1'", | "UPDATE `images` set imageNFSGroupID = '1'", | |||
"DELETE FROM `globalSettings` WHERE `settingKey` IN " | "DELETE FROM `globalSettings` WHERE `settingKey` IN " | |||
. "('FOG_NFS_HOST','FOG_NFS_FTP_USERNAME','FOG_NFS_FTP_PASSWORD'," | . "('FOG_NFS_HOST','FOG_NFS_FTP_USERNAME','FOG_NFS_FTP_PASSWORD'," | |||
. "'FOG_NFS_DATADIR','FOG_NFS_DATADIR_CAPTURE')", | . "'FOG_NFS_DATADIR','FOG_NFS_DATADIR_CAPTURE')", | |||
"INSERT IGNORE INTO `globalSettings` " | "INSERT IGNORE INTO `globalSettings` " | |||
. "(`settingKey`,`settingDesc`,`settingValue`,`settingCategory`) " | . "(`settingKey`,`settingDesc`,`settingValue`,`settingCategory`) " | |||
. "VALUES " | . "VALUES " | |||
. "('FOG_STORAGENODE_MYSQLUSER','This setting defines the username " | . "('FOG_STORAGENODE_MYSQLUSER','This setting defines the username " | |||
. "the storage nodes should use to connect to the fog server.'," | . "the storage nodes should use to connect to the fog server.'," | |||
. "'$fogstoragenodeuser','FOG Storage Nodes')," | . "'fogstorage','FOG Storage Nodes')", | |||
. "('FOG_STORAGENODE_MYSQLPASS','This setting defines the password " | ||||
. "the storage nodes should use to connect to the fog server.'," | ||||
. "'$fogstoragenodepass','FOG Storage Nodes')", | ||||
"GRANT ALL ON `" | ||||
. DATABASE_NAME | ||||
. "`.* TO '$fogstoragenodeuser'@'%' IDENTIFIED BY '$fogstoragenodepass'", | ||||
"UPDATE `schemaVersion` set `vValue`='16'", | "UPDATE `schemaVersion` set `vValue`='16'", | |||
); | ); | |||
// 17 | // 17 | |||
$this->schema[] = array( | $this->schema[] = array( | |||
"INSERT IGNORE INTO `globalSettings` " | "INSERT IGNORE INTO `globalSettings` " | |||
. "(`settingKey`,`settingDesc`,`settingValue`,`settingCategory`) " | . "(`settingKey`,`settingDesc`,`settingValue`,`settingCategory`) " | |||
. "VALUES " | . "VALUES " | |||
. "('FOG_SSH_USERNAME','This setting defines the username used " | . "('FOG_SSH_USERNAME','This setting defines the username used " | |||
. "for the ssh client.','root','SSH Client')," | . "for the ssh client.','root','SSH Client')," | |||
. "('FOG_SSH_PORT','This setting defines the port to use for the ssh client. '," | . "('FOG_SSH_PORT','This setting defines the port to use for the ssh client. '," | |||
skipping to change at line 2836 | skipping to change at line 2828 | |||
. "'", | . "'", | |||
); | ); | |||
// 185 | // 185 | |||
$this->schema[] = array( | $this->schema[] = array( | |||
"ALTER TABLE `nfsGroupMembers` ADD COLUMN " | "ALTER TABLE `nfsGroupMembers` ADD COLUMN " | |||
. "`ngmMaxBitrate` VARCHAR (25) AFTER `ngmFTPPath`", | . "`ngmMaxBitrate` VARCHAR (25) AFTER `ngmFTPPath`", | |||
); | ); | |||
// 186 | // 186 | |||
$this->schema[] = array( | $this->schema[] = array( | |||
"DELETE FROM `globalSettings` WHERE `settingKey`='FOG_NEW_CLIENT'", | "DELETE FROM `globalSettings` WHERE `settingKey`='FOG_NEW_CLIENT'", | |||
"ALTER TABLE .`hosts` ADD COLUMN `hostADPassLegacy` LONGTEXT AFTER `hostADPa ss`", | "ALTER TABLE `hosts` ADD COLUMN `hostADPassLegacy` LONGTEXT AFTER `hostADPas s`", | |||
"UPDATE `globalSettings` SET " | "UPDATE `globalSettings` SET " | |||
. "`settingDesc`='This setting defines the default value " | . "`settingDesc`='This setting defines the default value " | |||
. "to populate the hosts Active Directory password value " | . "to populate the hosts Active Directory password value " | |||
. "but only uses the old FOGCrypt method of encryption. " | . "but only uses the old FOGCrypt method of encryption. " | |||
. "This setting must be encrypted before stored.' " | . "This setting must be encrypted before stored.' " | |||
. "WHERE `settingKey`='FOG_AD_DEFAULT_PASSWORD_LEGACY'", | . "WHERE `settingKey`='FOG_AD_DEFAULT_PASSWORD_LEGACY'", | |||
"UPDATE `globalSettings` SET " | "UPDATE `globalSettings` SET " | |||
. "`settingDesc`='This setting defines the default value " | . "`settingDesc`='This setting defines the default value " | |||
. "to populate the host\'s Active Directory password value. " | . "to populate the host\'s Active Directory password value. " | |||
. "This setting will encrypt and store then encrypted value " | . "This setting will encrypt and store then encrypted value " | |||
skipping to change at line 3748 | skipping to change at line 3740 | |||
"UPDATE `nfsGroupMembers` SET `ngmUser`='" | "UPDATE `nfsGroupMembers` SET `ngmUser`='" | |||
. STORAGE_FTP_USERNAME | . STORAGE_FTP_USERNAME | |||
. "' WHERE ngmHostname='" | . "' WHERE ngmHostname='" | |||
. STORAGE_HOST | . STORAGE_HOST | |||
. "'" | . "'" | |||
); | ); | |||
// 267 | // 267 | |||
$this->schema[] = array( | $this->schema[] = array( | |||
"UPDATE `globalSettings` SET `settingValue`=275000 WHERE settingKey='FOG_KER NEL_RAMDISK_SIZE'" | "UPDATE `globalSettings` SET `settingValue`=275000 WHERE settingKey='FOG_KER NEL_RAMDISK_SIZE'" | |||
); | ); | |||
// 268 | ||||
$this->schema[] = array( | ||||
"UPDATE `globalSettings` SET " | ||||
. "`settingDesc`='Email address(s) to send the reports to. Separate " | ||||
. "multiple emails by comma (e.g. user_a@domain.com, user_b@domain2.com). " | ||||
. "Token \$\{user-name\} is replaced by the task creators username.'" | ||||
. "WHERE `settingKey`='FOG_EMAIL_ADDRESS'" | ||||
); | ||||
End of changes. 4 change blocks. | ||||
10 lines changed or deleted | 2 lines changed or added |