Update midPoint objects after architecture change

docker · Aug 20, 2018 · ef8edac · ef8edac
1 parent d51dd90
commit ef8edac
Show file tree

Hide file tree

Showing 8 changed files with 427 additions and 454 deletions.
diff --git a/grouper-midpoint/midpoint-objects/linux.properties b/grouper-midpoint/midpoint-objects/linux.properties
@@ -1,8 +1,6 @@
-s-data.ldap.host=s-data
-s-data.ldap.port=389
-s-data.db.host=s-data
-s-data.db.port=3306
-i-data.ldap.host=i-data
-i-data.ldap.port=389
-g-data.db.host=g-data
-g-data.db.port=3306
+sources.db.host=sources
+sources.db.port=3306
+directory.ldap.host=directory
+directory.ldap.port=389
+grouper.db.host=grouper-data
+grouper.db.port=3306
diff --git a/grouper-midpoint/midpoint-objects/resources/ldap-edu.xml b/grouper-midpoint/midpoint-objects/resources/ldap-edu.xml
diff --git a/...dpoint-objects/resources/ldap-grouper.xml → .../midpoint-objects/resources/ldap-main.xml b/...dpoint-objects/resources/ldap-grouper.xml → .../midpoint-objects/resources/ldap-main.xml
@@ -20,7 +20,7 @@
 
 	<resource oid="0a37121f-d515-4a23-9b6d-554c5ef61272">
 
-		<name>OpenLDAP for Grouper (i-data)</name>
+		<name>OpenLDAP (directory)</name>
 
 		<connectorRef type="ConnectorType">
 			<filter>
@@ -36,8 +36,8 @@
 			xmlns:icfcldap="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector">
 			<icfc:configurationProperties
 				xmlns:icfcldap="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/com.evolveum.polygon.connector-ldap/com.evolveum.polygon.connector.ldap.LdapConnector">
-                <icfcldap:port>$(i-data.ldap.port)</icfcldap:port>
-                <icfcldap:host>$(i-data.ldap.host)</icfcldap:host>
+                <icfcldap:port>$(directory.ldap.port)</icfcldap:port>
+                <icfcldap:host>$(directory.ldap.host)</icfcldap:host>
 				<icfcldap:baseContext>dc=internet2,dc=edu</icfcldap:baseContext>
 				<icfcldap:bindDn>cn=Directory Manager</icfcldap:bindDn>
 				<icfcldap:bindPassword>
@@ -80,14 +80,23 @@
 				<attribute>
 					<ref>ri:dn</ref>
 					<displayName>Distinguished Name</displayName>
-					<limitations>
-						<minOccurs>0</minOccurs>
-					</limitations>
+                    <limitations>
+                        <minOccurs>0</minOccurs>
+                    </limitations>
+                    <tolerant>false</tolerant>
 					<matchingRule>mr:stringIgnoreCase</matchingRule>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
-                            <path>extension/ldap_dn</path>
+                            <path>name</path>
                         </source>
+                        <expression>
+                            <script>
+                                <code>
+                                    'uid=' + name + ',ou=People,dc=internet2,dc=edu'
+                                </code>
+                            </script>
+                        </expression>
                     </outbound>
 				</attribute>
 				<attribute>
@@ -96,7 +105,9 @@
 					<limitations>
 						<minOccurs>0</minOccurs>
 					</limitations>
+                    <tolerant>false</tolerant>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
                             <path>fullName</path>
                         </source>
@@ -105,10 +116,12 @@
 				<attribute>
 					<ref>ri:sn</ref>
 					<displayName>Surname</displayName>
-					<limitations>
-						<minOccurs>0</minOccurs>
-					</limitations>
+                    <limitations>
+                        <minOccurs>0</minOccurs>
+                    </limitations>
+                    <tolerant>false</tolerant>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
                             <path>familyName</path>
                         </source>
@@ -117,7 +130,12 @@
 				<attribute>
 					<ref>ri:givenName</ref>
 					<displayName>Given Name</displayName>
+                    <limitations>
+                        <minOccurs>0</minOccurs>
+                    </limitations>
+                    <tolerant>false</tolerant>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
                             <path>givenName</path>
                         </source>
@@ -126,8 +144,10 @@
 				<attribute>
 					<ref>ri:uid</ref>
 					<displayName>Login Name</displayName>
+                    <tolerant>false</tolerant>
 					<matchingRule>mr:stringIgnoreCase</matchingRule>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
                             <path>name</path>
                         </source>
@@ -137,15 +157,19 @@
 					<ref>ri:mail</ref>
 					<displayName>Mail</displayName>
 					<matchingRule>mr:stringIgnoreCase</matchingRule>
+                    <tolerant>false</tolerant>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
                             <path>emailAddress</path>
                         </source>
                     </outbound>
 				</attribute>
 				<attribute>
 					<ref>ri:employeeNumber</ref>
+                    <tolerant>false</tolerant>
                     <outbound>
+                        <strength>strong</strength>
                         <source>
                             <path>employeeNumber</path>
                         </source>
@@ -161,19 +185,9 @@
 				</attribute>
                 <association>
                     <tolerant>false</tolerant>
-                    <ref>ri:courseGroup</ref>
-                    <displayName>Course-related groups membership</displayName>
+                    <ref>ri:group</ref>
                     <kind>entitlement</kind>
                     <intent>course-group</intent>
-                    <direction>objectToSubject</direction>
-                    <associationAttribute>ri:uniqueMember</associationAttribute>
-                    <valueAttribute>ri:dn</valueAttribute>
-                </association>
-                <association>
-                    <tolerant>false</tolerant>
-                    <ref>ri:genericGroup</ref>
-                    <displayName>Generic groups membership</displayName>
-                    <kind>entitlement</kind>
                     <intent>generic-group</intent>
                     <direction>objectToSubject</direction>
                     <associationAttribute>ri:uniqueMember</associationAttribute>

diff --git a/grouper-midpoint/midpoint-objects/resources/scriptedsql-grouper.xml b/grouper-midpoint/midpoint-objects/resources/scriptedsql-grouper.xml
@@ -18,8 +18,8 @@
 
 		<icfc:configurationProperties 
 			xmlns:icscscriptedsql="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/net.tirasa.connid.bundles.db.scriptedsql/net.tirasa.connid.bundles.db.scriptedsql.ScriptedSQLConnector">
-			<icscscriptedsql:host>$(g-data.db.host)</icscscriptedsql:host>
-			<icscscriptedsql:port>$(g-data.db.port)</icscscriptedsql:port>
+			<icscscriptedsql:host>$(grouper.db.host)</icscscriptedsql:host>
+			<icscscriptedsql:port>$(grouper.db.port)</icscscriptedsql:port>
 			<icscscriptedsql:quoting></icscscriptedsql:quoting>
 			<icscscriptedsql:user>root</icscscriptedsql:user>
 			<icscscriptedsql:password>

diff --git a/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-courses.xml b/grouper-midpoint/midpoint-objects/resources/scriptedsql-sis-courses.xml
@@ -18,14 +18,14 @@
 
 		<icfc:configurationProperties 
 			xmlns:icscscriptedsql="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/bundle/net.tirasa.connid.bundles.db.scriptedsql/net.tirasa.connid.bundles.db.scriptedsql.ScriptedSQLConnector">
-			<icscscriptedsql:host>$(s-data.db.host)</icscscriptedsql:host>
-			<icscscriptedsql:port>$(s-data.db.port)</icscscriptedsql:port>
+			<icscscriptedsql:host>$(sources.db.host)</icscscriptedsql:host>
+			<icscscriptedsql:port>$(sources.db.port)</icscscriptedsql:port>
 			<icscscriptedsql:quoting></icscscriptedsql:quoting>
 			<icscscriptedsql:user>root</icscscriptedsql:user>
 			<icscscriptedsql:password>
 				<clearValue></clearValue>
 			</icscscriptedsql:password>
-			<icscscriptedsql:database>grouper</icscscriptedsql:database>
+			<icscscriptedsql:database>sis</icscscriptedsql:database>
 			<!-- >icscscriptedsql:clearTextPasswordToScript>true</icscscriptedsql:clearTextPasswordToScript -->
 			<icscscriptedsql:scriptingLanguage>GROOVY</icscscriptedsql:scriptingLanguage>