YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2016-01-23 19:24:36 +01:00
commit 22d4b42cd4
2 changed files with 55 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
data/hooks/backup/05-conf_ldap
View file

@ -1,15 +1,16 @@
backup_dir="$1/conf/ldap" #!/bin/bash
sudo mkdir -p $backup_dir
backup_dir="${1}/conf/ldap"
sudo mkdir -p "$backup_dir"
# Fix for first jessie yunohost where slapd.conf is called slapd-yuno.conf # Fix for first jessie yunohost where slapd.conf is called slapd-yuno.conf
# without slapcat doesn't work # without slapcat doesn't work
if [ ! -f /etc/ldap/slapd.conf ] [[ ! -f /etc/ldap/slapd.conf ]] \
then && sudo mv /etc/ldap/slapd-yuno.conf /etc/ldap/slapd.conf
sudo mv /etc/ldap/slapd-yuno.conf /etc/ldap/slapd.conf
fi
sudo cp -a /etc/ldap/slapd.conf $backup_dir/ # Back up the configuration
sudo cp -a /etc/ldap/slapd.conf "${backup_dir}/slapd.conf"
sudo slapcat -b cn=config -l "${backup_dir}/cn=config.master.ldif"
sudo slapcat -l $backup_dir/slapcat.ldif.raw # Back up the database
sudo bash -c "egrep -v '^entryCSN:' < $backup_dir/slapcat.ldif.raw > $backup_dir/slapcat.ldif" sudo slapcat -b dc=yunohost,dc=org -l "${backup_dir}/dc=yunohost-dc=org.ldif"
sudo rm -f $backup_dir/slapcat.ldif.raw

65
data/hooks/restore/05-conf_ldap
View file

@ -1,36 +1,59 @@
backup_dir="$1/conf/ldap" #!/bin/bash
if [ -z "$2" ]; then backup_dir="${1}/conf/ldap"
if [[ $EUID -ne 0 ]]; then
# We need to execute this script as root, since the ldap # We need to execute this script as root, since the ldap
# service will be shut down during the operation (and sudo # service will be shut down during the operation (and sudo
# won't be available) # won't be available)
sudo bash $(pwd)/$0 $1 sudoed sudo /bin/bash $(readlink -f $0) $1
else else
service slapd stop service slapd stop || true
# Backup old configuration # Create a directory for backup
mv /var/lib/ldap /var/lib/ldap.old TMPDIR="/tmp/$(date +%s)"
mkdir -p "$TMPDIR"
# Recreate new DB folder die() {
mkdir /var/lib/ldap state=$1
chown openldap: /var/lib/ldap error=$2
chmod go-rwx /var/lib/ldap
# Restore LDAP configuration (just to be sure) # Restore saved configuration and database
cp -a $backup_dir/slapd.conf /etc/ldap/slapd.conf [[ $state -ge 1 ]] \
&& (rm -rf /etc/ldap/slapd.d &&
mv "${TMPDIR}/slapd.d" /etc/ldap/slapd.d)
[[ $state -ge 2 ]] \
&& (rm -rf /var/lib/ldap &&
mv "${TMPDIR}/ldap" /var/lib/ldap)
chown -R openldap: /etc/ldap/slapd.d /var/lib/ldap
# Regenerate the configuration service slapd start
rm -rf /etc/ldap/slapd.d/* rm -rf "$TMPDIR"
slaptest -u -f /etc/ldap/slapd.conf -F /etc/ldap/slapd.d
cp -rfp /var/lib/ldap.old/DB_CONFIG /var/lib/ldap
# Import the database # Print an error message and exit
slapadd -l $backup_dir/slapcat.ldif printf "%s" "$error" 1>&2
exit 1
}
# Restore the configuration
mv /etc/ldap/slapd.d "$TMPDIR"
mkdir -p /etc/ldap/slapd.d
cp -a "${backup_dir}/slapd.conf" /etc/ldap/slapd.conf
slapadd -F /etc/ldap/slapd.d -b cn=config \
-l "${backup_dir}/cn=config.master.ldif" \
|| die 1 "Unable to restore LDAP configuration"
chown -R openldap: /etc/ldap/slapd.d
# Restore the database
mv /var/lib/ldap "$TMPDIR"
mkdir -p /var/lib/ldap
slapadd -F /etc/ldap/slapd.d -b dc=yunohost,dc=org \
-l "${backup_dir}/dc=yunohost-dc=org.ldif" \
|| die 2 "Unable to restore LDAP database"
chown -R openldap: /var/lib/ldap
# Change permissions and restart slapd
chown openldap: /var/lib/ldap/*
service slapd start service slapd start
rm -rf /var/lib/ldap.old rm -rf "$TMPDIR"
fi fi