Changeset 409 for main/linuxmuster-base/trunk/debian/postinst

Timestamp:

12/07/08 13:51:14 (3 years ago)

Author:

tschmitt

Message:

• linuxmuster-setup:
  • obsoletes Konfigurationstemplate für sophomorix' slapd.conf entfernt.
  • obsoletes repair-admins-Skript entfernt.
  • div. Anpassungen bzgl. Neuerstellung der ldap-DB mit sophomorix bei Erstinstallation.
• paedml40-upgrade:
  • div. Fixes bzgl. slapd- und rembo/linbo-Konfiguration.

File:

• main/linuxmuster-base/trunk/debian/postinst (modified) (2 diffs)

main/linuxmuster-base/trunk/debian/postinst

@@ -565 +565 @@
         # adding tls support to slapd.conf
         slapdtpl=/usr/share/sophomorix/config-templates/ldap/slapd-standalone.conf.template
-        if ! grep -q ^TLS $slapdtpl || ! grep -q misc.schema $slapdtpl; then
-                cp $slapdtpl $slapdtpl.dpkg-old
-                cp $STATICTPLDIR$slapdtpl $slapdtpl
-        fi
         [ -e /etc/ldap/slapd.conf.custom ] || cp $STATICTPLDIR/etc/ldap/slapd.conf.custom /etc/ldap
         if ! grep -q ^TLS /etc/ldap/slapd.conf || ! grep -q misc.schema /etc/ldap/slapd.conf; then
@@ -578 +574 @@
                         s/@@message3@@/${message3}/
                         s/@@basedn@@/${basedn}/g
+                        s/@@tls_comment@@//g
                         s/@@ldappassword@@/${rootpw}/g" $slapdtpl > /etc/ldap/slapd.conf
                 addgroup openldap ssl-cert
+                chmod 600 /etc/ldap/slapd.conf*
                 slapd_reload=yes
         fi