Author: jfthomps
Date: Thu Aug 13 19:12:02 2015
New Revision: 1695753
URL: http://svn.apache.org/r1695753
Log:
VCL-870 - Synchronize foreign keys and other items between vcl.sql and
update-vcl.sql
vcl.sql: changed usergroup entries, for groups that had maxextendtime set to
30, changed that value to 60 to match the default value for new groups
update-vcl.sql:
-added entry to add 'Default for Editable by' user group
-added entry to add admin user to 'Default for Editable by' user group
-added delete to remove connecttimeout entry from variable table
(connecttimeout was renamed to reconnecttimeout)
-added entry to add 'xcat|timeout_error_limit' to variable table
-added entry to add 'xcat|rpower_error_limit' to variable table
Modified:
vcl/trunk/mysql/update-vcl.sql
vcl/trunk/mysql/vcl.sql
Modified: vcl/trunk/mysql/update-vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/update-vcl.sql?rev=1695753&r1=1695752&r2=1695753&view=diff
==============================================================================
--- vcl/trunk/mysql/update-vcl.sql (original)
+++ vcl/trunk/mysql/update-vcl.sql Thu Aug 13 19:12:02 2015
@@ -1846,6 +1846,7 @@ UPDATE user SET IMtypeid = NULL WHERE IM
UPDATE IGNORE `usergroup` SET `overlapResCount` = '50' WHERE
`usergroup`.`name` = 'adminUsers' AND `usergroup`.`overlapResCount` = 0;
CALL AddUserGroup('Allow No User Check', 'Local', 'admin', 'Local',
'adminUsers', 'Local');
+CALL AddUserGroup('Default for Editable by', 'Local', 'admin', 'Local',
'adminUsers', 'Local');
-- --------------------------------------------------------
@@ -1857,7 +1858,8 @@ INSERT IGNORE INTO `usergroupmembers` (`
((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM
`usergroup` WHERE `name` = 'adminUsers' AND `affiliationid` = (SELECT `id` FROM
`affiliation` WHERE `name` = 'Local'))),
((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM
`usergroup` WHERE `name` = 'manageNewImages' AND `affiliationid` = (SELECT `id`
FROM `affiliation` WHERE `name` = 'Local'))),
((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM
`usergroup` WHERE `name` = 'Specify End Time' AND `affiliationid` = (SELECT
`id` FROM `affiliation` WHERE `name` = 'Local'))),
-((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM
`usergroup` WHERE `name` = 'Allow No User Check' AND `affiliationid` = (SELECT
`id` FROM `affiliation` WHERE `name` = 'Local')));
+((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM
`usergroup` WHERE `name` = 'Allow No User Check' AND `affiliationid` = (SELECT
`id` FROM `affiliation` WHERE `name` = 'Local'))),
+((SELECT `id` FROM `user` WHERE `unityid` = 'admin' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')), (SELECT `id` FROM
`usergroup` WHERE `name` = 'Default for Editable by' AND `affiliationid` =
(SELECT `id` FROM `affiliation` WHERE `name` = 'Local')));
-- --------------------------------------------------------
@@ -1922,6 +1924,8 @@ INSERT IGNORE userpriv (usergroupid, pri
-- Inserts for table `variable`
--
+DELETE FROM `variable` WHERE `name` = 'connecttimeout' AND `serialization` =
'none';
+
INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('schema-version', 'none', '1');
INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('timesource|global',
'none','time.nist.gov,time-a.nist.gov,time-b.nist.gov,time.windows.com');
INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('acknowledgetimeout', 'none', '900');
@@ -1936,6 +1940,8 @@ INSERT IGNORE INTO `variable` (`name`, `
INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('natport_ranges', 'none', '5700-6500,9696-9701,49152-65535');
INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('windows_ignore_users', 'none', 'Administrator,cyg_server,root,sshd,Guest');
INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('windows_disable_users', 'none', '');
+INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('xcat|timeout_error_limit', 'none', '5');
+INSERT IGNORE INTO `variable` (`name`, `serialization`, `value`) VALUES
('xcat|rpower_error_limit', 'none', '3');
-- --------------------------------------------------------
Modified: vcl/trunk/mysql/vcl.sql
URL:
http://svn.apache.org/viewvc/vcl/trunk/mysql/vcl.sql?rev=1695753&r1=1695752&r2=1695753&view=diff
==============================================================================
--- vcl/trunk/mysql/vcl.sql (original)
+++ vcl/trunk/mysql/vcl.sql Thu Aug 13 19:12:02 2015
@@ -2012,12 +2012,12 @@ INSERT IGNORE INTO `localauth` (`userid`
--
INSERT IGNORE INTO `usergroup` (`id`, `name`, `affiliationid`, `ownerid`,
`editusergroupid`, `custom`, `courseroll`, `initialmaxtime`, `totalmaxtime`,
`maxextendtime`, `overlapResCount`) VALUES
-(1, 'global', 1, 1, 1, 1, 0, 240, 360, 30, 0),
+(1, 'global', 1, 1, 1, 1, 0, 240, 360, 60, 0),
(3, 'adminUsers', 1, 1, 1, 1, 0, 480, 600, 180, 50),
-(4, 'manageNewImages', 1, 1, 3, 1, 0, 240, 360, 30, 0),
-(5, 'Specify End Time', 1, 1, 3, 1, 0, 240, 360, 30, 0),
-(6, 'Allow No User Check', 1, 1, 3, 1, 0, 240, 360, 30, 0),
-(7, 'Default for Editable by', 1, 1, 3, 1, 0, 240, 360, 30, 0);
+(4, 'manageNewImages', 1, 1, 3, 1, 0, 240, 360, 60, 0),
+(5, 'Specify End Time', 1, 1, 3, 1, 0, 240, 360, 60, 0),
+(6, 'Allow No User Check', 1, 1, 3, 1, 0, 240, 360, 60, 0),
+(7, 'Default for Editable by', 1, 1, 3, 1, 0, 240, 360, 60, 0);
--
-- Dumping data for table `usergroupmembers`
