Project

General

Profile

« Previous | Next » 

Revision ee4c09eb

Added by Alexis Mousset about 7 years ago

Fixes #10522: Cannot install Rudder 4.1 due to merge error in parent ticket

View differences:

rudder-inventory-ldap/debian/postinst
RUDDER_SHARE=/opt/rudder/share
RUDDER_UPGRADE_TOOLS=${RUDDER_SHARE}/upgrade-tools
BACKUP_LDIF_PATH=/var/rudder/ldap/backup/
<<<<<<< HEAD
BACKUP_LDIF_REGEX="^/var/rudder/ldap/backup/openldap-data-pre-upgrade-\([0-9]\{14\}\)\.ldif$"
SLAPD_CONF="/opt/rudder/etc/openldap/slapd.conf"
=======
SLAPD_CONF="/opt/rudder/etc/openldap/slapd.conf"
BACKUP_LDIF_REGEX="^/var/rudder/ldap/backup/openldap-data-pre-upgrade-\([0-9]\{14\}\)\.ldif\(\.gz\)\?$"
>>>>>>> branches/rudder/4.0
# We need it to be able to open big mdb memory-mapped databases
ulimit -v unlimited

Also available in: Unified diff