Merge branch 'master' into dist/eole/2.7.2/master

2021-01-20 16:50:19 +01:00 · 2021-01-20 16:50:19 +01:00 · 87fd2fa1ad
commit 87fd2fa1ad
parent 2b1dae6ed0 613b33236c
5 changed files with 179 additions and 106 deletions
--- a/ldap/schema/eole/cadoles.schema-2.ldif
+++ b/ldap/schema/eole/cadoles.schema-2.ldif
@ -0,0 +1,96 @@
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.1
+schemaIdGuid:: BS9z8eJKvYZ+lS8OJgeC1g==
+cn: cadolesPerson
+name: cadolesPerson
+lDAPDisplayName: cadolesPerson
+description: Description Personne Cadoles
+subClassOf: top
+objectClassCategory: 3
+mayContain: givensName
+mayContain: usualname
+mayContain: birthdate
+mayContain: birthcountry
+mayContain: birthplace
+mayContain: gender
+mayContain: job
+mayContain: position
+mayContain: belongingpopulation
+mayContain: authlevel
+defaultObjectCategory: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.2
+schemaIdGuid:: 7pJbNueSjwpq7TsL2aiW1w==
+cn: cadolesSiren
+name: cadolesSiren
+lDAPDisplayName: cadolesSiren
+description: Siren
+subClassOf: top
+objectClassCategory: 3
+mayContain: siren
+mayContain: niveau01
+defaultObjectCategory: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.3
+schemaIdGuid:: BOOf/nwBuCFehtpsyYrLjA==
+cn: cadolesSiret
+name: cadolesSiret
+lDAPDisplayName: cadolesSiret
+description: Siret
+subClassOf: top
+objectClassCategory: 3
+mayContain: siret
+mayContain: postalAddress
+mayContain: niveau02
+defaultObjectCategory: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
+
+DN:
+changeType: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+dn: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
+changeType: add
+objectClass: top
+objectClass: classSchema
+governsID: 2.16.840.1.113732.3.1.4
+schemaIdGuid:: IPc/rPzhpAjekHrvXgdI8w==
+cn: cadolesGroup
+name: cadolesGroup
+lDAPDisplayName: cadolesGroup
+description: Descirption Groupe Cadoles
+subClassOf: top
+objectClassCategory: 3
+mayContain: cadolesMember
+defaultObjectCategory: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
+
--- a/ldap/schema/eole/cadoles.schema.ldif
+++ b/ldap/schema/eole/cadoles.schema.ldif
@ -297,100 +297,3 @@ description: Label Etablissement
 attributeSyntax: 2.5.5.12
 oMSyntax: 64
 isSingleValued: TRUE
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-dn: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.1
-schemaIdGuid:: BS9z8eJKvYZ+lS8OJgeC1g==
-cn: cadolesPerson
-name: cadolesPerson
-lDAPDisplayName: cadolesPerson
-description: Description Personne Cadoles
-subClassOf: top
-objectClassCategory: 3
-mayContain: givensName
-mayContain: usualname
-mayContain: birthdate
-mayContain: birthcountry
-mayContain: birthplace
-mayContain: gender
-mayContain: job
-mayContain: position
-mayContain: belongingpopulation
-mayContain: authlevel
-defaultObjectCategory: CN=cadolesPerson,CN=Schema,CN=Configuration,{DNCONFIG}
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-dn: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.2
-schemaIdGuid:: 7pJbNueSjwpq7TsL2aiW1w==
-cn: cadolesSiren
-name: cadolesSiren
-lDAPDisplayName: cadolesSiren
-description: Siren
-subClassOf: top
-objectClassCategory: 3
-mayContain: siren
-mayContain: niveau01
-defaultObjectCategory: CN=cadolesSiren,CN=Schema,CN=Configuration,{DNCONFIG}
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-dn: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.3
-schemaIdGuid:: BOOf/nwBuCFehtpsyYrLjA==
-cn: cadolesSiret
-name: cadolesSiret
-lDAPDisplayName: cadolesSiret
-description: Siret
-subClassOf: top
-objectClassCategory: 3
-mayContain: siret
-mayContain: postalAddress
-mayContain: niveau02
-defaultObjectCategory: CN=cadolesSiret,CN=Schema,CN=Configuration,{DNCONFIG}
-
-DN:
-changeType: modify
-add: schemaUpdateNow
-schemaUpdateNow: 1
-
-
-dn: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
-changeType: add
-objectClass: top
-objectClass: classSchema
-governsID: 2.16.840.1.113732.3.1.4
-schemaIdGuid:: IPc/rPzhpAjekHrvXgdI8w==
-cn: cadolesGroup
-name: cadolesGroup
-lDAPDisplayName: cadolesGroup
-description: Descirption Groupe Cadoles
-subClassOf: top
-objectClassCategory: 3
-mayContain: cadolesMember
-defaultObjectCategory: CN=cadolesGroup,CN=Schema,CN=Configuration,{DNCONFIG}
-
--- a/postservice/91-cadolesldap
+++ b/postservice/91-cadolesldap
@ -0,0 +1,69 @@
+#!/bin/bash
+
+#
+# Initialisation of LDAP Directory
+#
+
+
+#
+# Run command as particular user
+#
+function runAs() {
+    USER=${1}
+    shift
+    CMD="su ${USER} -s /bin/bash -c ${@}"
+
+    eval ${CMD}
+    return ${?}
+}
+
+function addLDAPschema()
+{
+   LDIF="/etc/cadolesldap/init/cadolesldap.ldif"
+   USER="openldap"
+   CMD="\"slapadd -l ${LDIF} -f \"/etc/ldap/slapd.conf\"\""
+
+   service slapd stop
+   runAs ${USER} ${CMD}
+   result=$((result+${?}))
+   service slapd start
+   return ${result}
+}
+
+function addADSchema()
+{
+   /usr/share/eole/sbin/cadoles_add_schema.sh
+   return ${?} 
+}
+
+function main()
+{
+   MODE=${1}
+   result=0
+
+
+   if [[ ${MODE} == "instance" ]]
+   then
+      if [[ $(CreoleGet eole_module) == "seth" ]]
+      then
+         addADSchema
+	 return ${?}
+      else
+         addLDAPschema
+	 return ${?}
+      fi
+   fi
+}
+
+if [[ $(CreoleGet eole_module eolebase) != "seth" ]]
+then
+   exit 0
+fi
+
+if [[ $(CreoleGet activer_cadolesldap non) == "oui" ]]
+then
+   main $@
+   exit ${?}
+else
+   exit 0
+fi
--- a/posttemplate/91-cadolesldap
+++ b/posttemplate/91-cadolesldap
@ -55,6 +55,11 @@ function main()
   fi
 }

+if [[ $(CreoleGet eole_module eolebase) == "seth" ]]
+then
+   exit 0
+fi
+
 if [[ $(CreoleGet activer_cadolesldap non) == "oui" ]]
 then
   main $@
--- a/scripts/cadoles_add_schema.sh
+++ b/scripts/cadoles_add_schema.sh
@ -33,23 +33,23 @@ RETURNED=$(ldbsearch --option="dsdb:schema update allowed"=true -H /var/lib/samb

 if [ "$RETURNED" = "# returned 0 records" ]; then
    # Import schema
-    SCHEMAS="cadoles.schema"
+    SCHEMAS="cadoles.schema cadoles.schema-2"
    PRIVATE_DIR=/etc/eole/private

    for schema in $SCHEMAS
    do
-	updateSchemaDN "{DNCONFIG}" "${DN}" /etc/ldap/schema/eole/${schema}.ldif
-	if [[ $? -ne 0 ]]
-	then
+        updateSchemaDN "{DNCONFIG}" "${DN}" /etc/ldap/schema/eole/${schema}.ldif
+        if [[ $? -ne 0 ]]
+        then
           echo "Error updating DN for ${schema}"
           break
        fi
        ldbmodify -H /var/lib/samba/private/sam.ldb /etc/ldap/schema/eole/${schema}.ldif --option="dsdb:schema update allowed"=true
-	if [[ $? -ne 0 ]]
-	then
-           echo "Error updating Schema ${schema} !!"
-           break
-	fi
+        if [[ $? -ne 0 ]]
+        then
+            echo "Error updating Schema ${schema} !!"
+            break
+    	fi
    done
 fi