Changeset 669bb09 for npl/commonservers

Timestamp:

02/28/18 18:30:42 (7 years ago)

Author:

Edwin Eefting <edwin@datux.nl>

Branches:

master, perl-5.22

Children:

b7b790b

Parents:

031ab69

Message:

make sure ldap is properly initalized when post.openldap is run. prevents failing of radius openldap and others on initial installation

Location:

npl/commonservers

Files:

• openldap_conf/openldap_conf.SlackBuild.log.gz (modified) (previous)
• openldap_conf/openldap_conf.build (modified) (1 diff)
• openldap_conf/openldap_conf.md5 (modified) (2 diffs)
• openldap_conf/openldap_conf.pkg (modified) (previous)
• openldap_conf/root/etc/postinst.d/post.openldap (modified) (7 diffs)
• radius_conf/radius_conf.SlackBuild.log.gz (modified) (previous)
• radius_conf/radius_conf.build (modified) (1 diff)
• radius_conf/radius_conf.md5 (modified) (1 diff)
• radius_conf/radius_conf.pkg (modified) (previous)
• radius_conf/root/etc/postinst.d/post.radius (modified) (1 diff)

npl/commonservers/openldap_conf/openldap_conf.build

@@ -1 @@
-6138
+6139

npl/commonservers/openldap_conf/openldap_conf.md5

@@ -1 @@
-ab9c980820843c8905078b752145d79a  ./openldap_conf.pkg
+f4a0dab71fdb0f1b3e5d235f4dd89b0d  ./openldap_conf.pkg
 aee0cd9d2d52c0cd9c64e4110c13055a  ./openldap_conf.SlackBuild
-3af053396074de9e39edb09d8d676bc3  ./openldap_conf.SlackBuild.log.gz
+f8c3c4c47fd2bdab42b7a920bd3dddc5  ./openldap_conf.SlackBuild.log.gz
 12c6b4a9321d80e38228b15b3322da88  ./root/etc/openldap/ldap.conf.new
 d5cd7779a0b7c4bacd42fc612e0495b1  ./root/etc/openldap/minimum.ldif
@@ -23 +23 @@
 ea991b8ecbe7461a8a1e106e2a0a602a  ./root/etc/openldap/slapd.conf.mirror1.new
 19a23d46ccf41a0e8bb554c2bd73525f  ./root/etc/openldap/slapd.conf.mirror2.new
-8421f98e9a29e14b40d558aa6d34fa70  ./root/etc/postinst.d/post.openldap
+b27707233477d9908e94a071c5a13ef0  ./root/etc/postinst.d/post.openldap
 f9f0c7bd032391d7fcf57deacb663ee6  ./root/root/ldaprc
 1a33e9d4b16d1a7574fc5d021074ab5b  ./root/service/slapd/run

npl/commonservers/openldap_conf/root/etc/postinst.d/post.openldap

@@ -23 +23 @@
         sed -i "s/%ldap_passwd%/$PASSWD/" /etc/openldap/slapd.conf || exit 1
 fi
-            
+
+#initalize config settings
+cd /usr/webint/htdocs/settings/
+php ldap_config.php init
 
 #upgrade aanwezig?
@@ -29 +32 @@
         DB=`cat /etc/openldap/slapd.conf|grep ^directory|cut -f2`
 
-        
+
         ##### 1. exporteer de database
         if ! [ -e $BACKUP ] && [ -e $DB/cn.* ]; then
                 echo "Dumping database"
-                #dumpen 
+                #dumpen
                 if ! slapcat > $BACKUP ; then
                         rm $BACKUP
@@ -40 +43 @@
                 fi
                 sync
-        
+
                 #verwijder de oude database van de disk
                 if ! [ -d $DB ]; then
@@ -48 +51 @@
                 rm $DB/* || exit 1
                 sync
-        fi      
-        
+        fi
+
         #is er wat mis?
         #Dit zal theoretisch niet voor kunnen komen:
         if [ -e $BACKUP ] && [ -e $DB/cn.* ]; then
                 echo "Er ging wat mis met het upgraden van de database. U heeft nu zowel een dump file als een database, neem contact op met Syn-3 of los dit handmatig op."
-                exit 1    
+                exit 1
         fi
 
@@ -64 +67 @@
         rm -r /service/slurpd 2>/dev/null
         rm -r /etc/openldap/schema -r 2>/dev/null
-        # we gebruiken nu syncrepl in mirror mode. 
+        # we gebruiken nu syncrepl in mirror mode.
         # de .slave file is vervangen door slapd.conf.mirror1 en mirror2
         rm /etc/openldap/slapd.conf.slave 2>/dev/null
@@ -93 +96 @@
         sed 's@include.*/schema/.*core.*@include /etc/openldap/schemas.conf@' -i /etc/openldap/slapd.conf.* || exit 1
         sed 's@include.*/schema/@#&@' -i /etc/openldap/slapd.conf.* || exit 1
-        #genereer de schemas.conf opnieuw: 
+        #genereer de schemas.conf opnieuw:
         #(gebeurd ook automatsich bij ldap restart)
         syn3-ldapconf || exit 1
@@ -106 +109 @@
                 #filter ACI's er uit, deze zijn veranderd en werken niet meer, maar zijn ook niet nodig.
                 #filter een duplicate entryUUID eruit
-                cat $BACKUP | 
-                        grep -v "^OpenLDAPaci" | 
+                cat $BACKUP |
+                        grep -v "^OpenLDAPaci" |
                         grep -v "^entryUUID: 482c8c22-b202-1028-9c4d-d9ea740d6018" |
                         slapadd -q || exit 1

npl/commonservers/radius_conf/radius_conf.build

@@ -1 @@
-2
+3

npl/commonservers/radius_conf/radius_conf.md5

@@ -1 @@
-4b7070f08d09041f4bc79db97c447980  ./radius_conf.pkg
+79128827f35f5db8c81bce21a8f14e91  ./radius_conf.pkg
 d0a1aa910d8789a30f169a5f8f97b5a1  ./radius_conf.SlackBuild
-00a6001f8295a7c919505de643e4cdd6  ./radius_conf.SlackBuild.log.gz
+949791155f2b1afad7080c8744ac6108  ./radius_conf.SlackBuild.log.gz
 e7c9c560c9355252dd5acf6da3c8c373  ./root/etc/logrotate.d/radius
-a4d228ed171e0794ac9fead55f96505c  ./root/etc/postinst.d/post.radius
+fc678c54379efd13620deb6e9862f2e3  ./root/etc/postinst.d/post.radius
 602c3c8baf57abf04433843b251b21c9  ./root/home/system/radius/raddb/acct_users
 24958dbed540952e6522a135ccf8f500  ./root/home/system/radius/raddb/attrs

npl/commonservers/radius_conf/root/etc/postinst.d/post.radius

@@ -7 +7 @@
 chmod 700 /home/system/radius
 
-#needed to create group
-/sbin/postinst.sh post.openldap
-svcstart /service/slapd/  
 
 if ! ( getent group | grep "Windows VPN - pptp" &> /dev/null ) ; then