Index: lams_common/db/sql/updatescripts/alter_21_branching.sql =================================================================== diff -u -r7248fb9335792be231dcc498f37b28ffa0c794dc -r20be71f75a759599684ff883011b2028098678e5 --- lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 7248fb9335792be231dcc498f37b28ffa0c794dc) +++ lams_common/db/sql/updatescripts/alter_21_branching.sql (.../alter_21_branching.sql) (revision 20be71f75a759599684ff883011b2028098678e5) @@ -105,7 +105,7 @@ , ADD COLUMN format VARCHAR(30) , ADD COLUMN required TINYINT NOT NULL DEFAULT 0; -update lams_configuration st description_key='config.server.url', header_name='config.header.system', format='STRING', required=1 where config_key='ServerURL'; +update lams_configuration set description_key='config.server.url', header_name='config.header.system', format='STRING', required=1 where config_key='ServerURL'; update lams_configuration set description_key='config.server.url.context.path', header_name='config.header.system', format='STRING', required=1 where config_key='ServerURLContextPath'; update lams_configuration set description_key='config.version', header_name='config.header.system', format='STRING', required=1 where config_key='Version'; update lams_configuration set description_key='config.temp.dir', header_name='config.header.system', format='STRING', required=1 where config_key='TempDir'; @@ -139,41 +139,40 @@ update lams_configuration set description_key='config.allow.direct.lesson.launch', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='AllowDirectLessonLaunch'; update lams_configuration set description_key='config.community.enable', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='LAMS_Community_enable'; update lams_configuration set description_key='config.allow.live.edit', header_name='config.header.features', format='BOOLEAN', required=1 where config_key='AllowLiveEdit'; -update lams_configuration set description_key='config.ldap.provisioning.enabled', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPProvisioningEnabled'; -update lams_configuration set description_key='config.ldap.provider.url', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPProviderURL'; -update lams_configuration set description_key='config.ldap.security.authentication', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPSecurityAuthentication'; -update lams_configuration set description_key='config.ldap.principal.dn.prefix', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPPrincipalDNPrefix'; -update lams_configuration set description_key='config.ldap.principal.dn.suffix', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPPrincipalDNSuffix'; -update lams_configuration set description_key='config.ldap.security.protocol', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPSecurityProtocol'; -update lams_configuration set description_key='config.ldap.truststore.path', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPTruststorePath'; -update lams_configuration set description_key='config.ldap.truststore.password', header_name='config.header.ldap', format='STRING', required=0 where config_key='LDAPTruststorePassword'; -update lams_configuration set description_key='config.ldap.login.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLoginAttr'; -update lams_configuration set description_key='config.ldap.fname.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPFNameAttr'; -update lams_configuration set description_key='config.ldap.lname.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLNameAttr'; -update lams_configuration set description_key='config.ldap.email.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPEmailAttr'; -update lams_configuration set description_key='config.ldap.addr1.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAddr1Attr'; -update lams_configuration set description_key='config.ldap.addr2.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAddr2Attr'; -update lams_configuration set description_key='config.ldap.addr3.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAddr3Attr'; -update lams_configuration set description_key='config.ldap.city.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPCityAttr'; -update lams_configuration set description_key='config.ldap.state.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPStateAttr'; -update lams_configuration set description_key='config.ldap.postcode.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPPostcodeAttr'; -update lams_configuration set description_key='config.ldap.country.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPCountryAttr'; -update lams_configuration set description_key='config.ldap.day.phone.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPDayPhoneAttr'; -update lams_configuration set description_key='config.ldap.evening.phone.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPEveningPhoneAttr'; -update lams_configuration set description_key='config.ldap.fax.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPFaxAttr'; -update lams_configuration set description_key='config.ldap.mobile.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPMobileAttr'; -update lams_configuration set description_key='config.ldap.locale.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLocaleAttr'; -update lams_configuration set description_key='config.ldap.disabled.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPDisabledAttr'; -update lams_configuration set description_key='config.ldap.org.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPOrgAttr'; -update lams_configuration set description_key='config.ldap.roles.attr', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPRolesAttr'; -update lams_configuration set description_key='config.ldap.learner.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPLearnerMap'; -update lams_configuration set description_key='config.ldap.monitor.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPMonitorMap'; -update lams_configuration set description_key='config.ldap.author.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPAuthorMap'; -update lams_configuration set description_key='config.ldap.group.admin.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPGroupAdminMap'; -update lams_configuration set description_key='config.ldap.group.manager.map', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPGroupManagerMap'; -update lams_configuration set description_key='config.ldap.update.on.login', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPUpdateOnLogin'; -update lams_configuration set description_key='config.ldap.org.field', header_name='config.header.ldap.attributes', format='STRING', required=0 where config_key='LDAPOrgField'; -update lams_configuration set description_key='config.ldap.only.one.org', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPOnlyOneOrg'; -update lams_configuration set description_key='config.ldap.encrypt.password.from.browser', header_name='config.header.ldap', format='BOOLEAN', required=1 where config_key='LDAPEncryptPasswordFromBrowser'; -update lams_configuration set description_key='config.ldap.search.results.page.size', header_name='config.header.ldap', format='LONG', required=0 where config_key='LDAPSearchResultsPageSize'; - +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPProvisioningEnabled','false', 'config.ldap.provisioning.enabled', 'config.header.ldap', 'BOOLEAN', 1); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPProviderURL','ldap://192.168.111.15', 'config.ldap.provider.url', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPSecurityAuthentication','simple', 'config.ldap.security.authentication', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPPrincipalDNPrefix','cn=', 'config.ldap.principal.dn.prefix', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPPrincipalDNSuffix',',ou=Users,dc=melcoe,dc=mq,dc=edu,dc=au', 'config.ldap.principal.dn.suffix', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPSecurityProtocol','', 'config.ldap.security.protocol', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPTruststorePath','', 'config.ldap.truststore.path', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPTruststorePassword','', 'config.ldap.truststore.password', 'config.header.ldap', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPLoginAttr','uid', 'config.ldap.login.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPFNameAttr','givenName', 'config.ldap.fname.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPLNameAttr','sn', 'config.ldap.lname.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPEmailAttr','mail', 'config.ldap.email.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPAddr1Attr','postalAddress', 'config.ldap.addr1.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPAddr2Attr','', 'config.ldap.addr2.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPAddr3Attr','', 'config.ldap.addr3.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPCityAttr','l', 'config.ldap.city.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPStateAttr','st', 'config.ldap.state.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPPostcodeAttr','postalCode', 'config.ldap.postcode.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPCountryAttr','', 'config.ldap.country.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPDayPhoneAttr','telephoneNumber', 'config.ldap.day.phone.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPEveningPhoneAttr','homePhone', 'config.ldap.evening.phone.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPFaxAttr','facsimileTelephoneNumber', 'config.ldap.fax.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPMobileAttr','mobile', 'config.ldap.mobile.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPLocaleAttr','preferredLanguage', 'config.ldap.locale.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPDisabledAttr','!accountStatus', 'config.ldap.disabled.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPOrgAttr','deetITSchoolCode', 'config.ldap.org.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPRolesAttr','memberOf', 'config.ldap.roles.attr', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPLearnerMap','Student;SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.learner.map', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPMonitorMap','SchoolSupportStaff;Teacher;SeniorStaff;Principal', 'config.ldap.monitor.map', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPAuthorMap','Teacher;SeniorStaff;Principal', 'config.ldap.author.map', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPGroupAdminMap','Teacher;SeniorStaff', 'config.ldap.group.admin.map', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPGroupManagerMap','Principal', 'config.ldap.group.manager.map', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPUpdateOnLogin', 'true', 'config.ldap.update.on.login', 'config.header.ldap', 'BOOLEAN', 1); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPOrgField', 'code', 'config.ldap.org.field', 'config.header.ldap.attributes', 'STRING', 0); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPOnlyOneOrg', 'true', 'config.ldap.only.one.org', 'config.header.ldap', 'BOOLEAN', 1); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPEncryptPasswordFromBrowser', 'true', 'config.ldap.encrypt.password.from.browser', 'config.header.ldap', 'BOOLEAN', 1); +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) values ('LDAPSearchResultsPageSize', '100', 'config.ldap.search.results.page.size', 'config.header.ldap', 'LONG', 0);