Switch to memberOf groups

lafriks · lafriks · commit 36f535669b0b · 2018-05-05T03:43:43.000+03:00
diff --git a/bootstrap/config/memberof_config.ldif b/bootstrap/config/memberof_config.ldif
@@ -0,0 +1,17 @@
+dn: cn=module,cn=config
+cn: module
+objectClass: olcModuleList
+olcModuleLoad: memberof
+olcModulePath: /usr/lib/ldap
+
+dn: olcOverlay={0}memberof,olcDatabase={1}hdb,cn=config
+objectClass: olcConfig
+objectClass: olcMemberOf
+objectClass: olcOverlayConfig
+objectClass: top
+olcOverlay: memberof
+olcMemberOfDangling: ignore
+olcMemberOfRefInt: TRUE
+olcMemberOfGroupOC: groupOfNames
+olcMemberOfMemberAD: member
+olcMemberOfMemberOfAD: memberOf
diff --git a/bootstrap/config/refint1.ldif b/bootstrap/config/refint1.ldif
@@ -0,0 +1,3 @@
+dn: cn=module{1},cn=config
+add: olcmoduleload
+olcmoduleload: refint
diff --git a/bootstrap/config/refint2.ldif b/bootstrap/config/refint2.ldif
@@ -0,0 +1,7 @@
+dn: olcOverlay={1}refint,olcDatabase={1}hdb,cn=config
+objectClass: olcConfig
+objectClass: olcOverlayConfig
+objectClass: olcRefintConfig
+objectClass: top
+olcOverlay: {1}refint
+olcRefintAttribute: memberof member manager owner
diff --git a/bootstrap/data/30_groups_admin.ldif b/bootstrap/data/30_groups_admin.ldif
@@ -1,7 +1,6 @@
 dn: cn=admin_staff,ou=people,dc=planetexpress,dc=com
-objectclass: Group
+objectclass: groupOfNames
 objectclass: top
-groupType: 2147483650
 cn: admin_staff
 member: cn=Hubert J. Farnsworth,ou=people,dc=planetexpress,dc=com
 member: cn=Hermes Conrad,ou=people,dc=planetexpress,dc=com
diff --git a/bootstrap/data/30_groups_crew.ldif b/bootstrap/data/30_groups_crew.ldif
@@ -1,7 +1,6 @@
 dn: cn=ship_crew,ou=people,dc=planetexpress,dc=com
-objectclass: Group
+objectclass: groupOfNames
 objectclass: top
-groupType: 2147483650
 cn: ship_crew
 member: cn=Philip J. Fry,ou=people,dc=planetexpress,dc=com
 member: cn=Turanga Leela,ou=people,dc=planetexpress,dc=com
diff --git a/bootstrap/data/31_groups_git.ldif b/bootstrap/data/31_groups_git.ldif
@@ -1,7 +1,9 @@
 dn: cn=git,ou=people,dc=planetexpress,dc=com
-objectclass: Group
+objectclass: groupOfNames
 objectclass: top
-groupType: 2147483650
 cn: git
-member: cn=admin_staff,ou=people,dc=planetexpress,dc=com
-member: cn=ship_crew,ou=people,dc=planetexpress,dc=com
+member: cn=Hubert J. Farnsworth,ou=people,dc=planetexpress,dc=com
+member: cn=Hermes Conrad,ou=people,dc=planetexpress,dc=com
+member: cn=Philip J. Fry,ou=people,dc=planetexpress,dc=com
+member: cn=Turanga Leela,ou=people,dc=planetexpress,dc=com
+member: cn=Bender Bending Rodríguez,ou=people,dc=planetexpress,dc=com
diff --git a/bootstrap/slapd-init.sh b/bootstrap/slapd-init.sh
@@ -71,6 +71,13 @@ configure_ssh_features(){
   ldapadd -Y EXTERNAL -H ldapi:/// -f ${CONFIG_DIR}/openssh_lpk.ldif -Q
 }
 
+configure_memberof_features(){
+  echo "Configure MemberOf Extensions"
+  ldapadd -Y EXTERNAL -H ldapi:/// -f ${CONFIG_DIR}/memberof_config.ldif -Q
+  ldapmodify -Y EXTERNAL -H ldapi:/// -f ${CONFIG_DIR}/refint1.ldif -Q
+  ldapadd -Y EXTERNAL -H ldapi:/// -f ${CONFIG_DIR}/refint2.ldif -Q
+}
+
 load_initial_data() {
     echo "Load data..."
     local data=$(find ${DATA_DIR} -maxdepth 1 -name \*_\*.ldif -type f | sort)
@@ -93,6 +100,7 @@ slapd -h "ldapi:///" -u openldap -g openldap
 
 configure_msad_features
 configure_ssh_features
+configure_memberof_features
 configure_tls
 configure_logging
 load_initial_data

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+dn: cn=module{1},cn=config`
	`2`	`+add: olcmoduleload`
	`3`	`+olcmoduleload: refint`