Tidying
This commit is contained in:
parent
bccd2443b0
commit
d540a4b1cb
|
@ -320,20 +320,21 @@ function restore_mutt_settings {
|
||||||
${PROJECT_NAME}-adduser $USERNAME
|
${PROJECT_NAME}-adduser $USERNAME
|
||||||
fi
|
fi
|
||||||
echo $"Restoring Mutt settings for $USERNAME"
|
echo $"Restoring Mutt settings for $USERNAME"
|
||||||
restore_directory_from_usb /root/tempmutt mutt/$USERNAME
|
temp_restore_dir=/root/tempmutt
|
||||||
if [ -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc ]; then
|
restore_directory_from_usb $temp_restore_dir mutt/$USERNAME
|
||||||
cp -f /root/tempmutt/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
|
if [ -f $temp_restore_dir/home/$USERNAME/tempbackup/.muttrc ]; then
|
||||||
|
cp -f $temp_restore_dir/home/$USERNAME/tempbackup/.muttrc /home/$USERNAME/.muttrc
|
||||||
fi
|
fi
|
||||||
if [ -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc ]; then
|
if [ -f $temp_restore_dir/home/$USERNAME/tempbackup/Muttrc ]; then
|
||||||
cp -f /root/tempmutt/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
|
cp -f $temp_restore_dir/home/$USERNAME/tempbackup/Muttrc /etc/Muttrc
|
||||||
fi
|
fi
|
||||||
if [ ! "$?" = "0" ]; then
|
if [ ! "$?" = "0" ]; then
|
||||||
rm -rf /root/tempmutt
|
rm -rf $temp_restore_dir
|
||||||
set_user_permissions
|
set_user_permissions
|
||||||
backup_unmount_drive
|
backup_unmount_drive
|
||||||
exit 276
|
exit 276
|
||||||
fi
|
fi
|
||||||
rm -rf /root/tempmutt
|
rm -rf $temp_restore_dir
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -353,15 +354,16 @@ function restore_gpg {
|
||||||
${PROJECT_NAME}-adduser $USERNAME
|
${PROJECT_NAME}-adduser $USERNAME
|
||||||
fi
|
fi
|
||||||
echo $"Restoring gnupg settings for $USERNAME"
|
echo $"Restoring gnupg settings for $USERNAME"
|
||||||
restore_directory_from_usb /root/tempgnupg gnupg/$USERNAME
|
temp_restore_dir=/root/tempgnupg
|
||||||
cp -r /root/tempgnupg/home/$USERNAME/.gnupg /home/$USERNAME/
|
restore_directory_from_usb $temp_restore_dir gnupg/$USERNAME
|
||||||
|
cp -r $temp_restore_dir/home/$USERNAME/.gnupg /home/$USERNAME/
|
||||||
if [ ! "$?" = "0" ]; then
|
if [ ! "$?" = "0" ]; then
|
||||||
rm -rf /root/tempgnupg
|
rm -rf $temp_restore_dir
|
||||||
set_user_permissions
|
set_user_permissions
|
||||||
backup_unmount_drive
|
backup_unmount_drive
|
||||||
exit 276
|
exit 276
|
||||||
fi
|
fi
|
||||||
rm -rf /root/tempgnupg
|
rm -rf $temp_restore_dir
|
||||||
if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
|
if [[ "$USERNAME" == "$ADMIN_USERNAME" ]]; then
|
||||||
cp -r /home/$USERNAME/.gnupg /root
|
cp -r /home/$USERNAME/.gnupg /root
|
||||||
if [ ! "$?" = "0" ]; then
|
if [ ! "$?" = "0" ]; then
|
||||||
|
@ -389,15 +391,16 @@ function restore_procmail {
|
||||||
${PROJECT_NAME}-adduser $USERNAME
|
${PROJECT_NAME}-adduser $USERNAME
|
||||||
fi
|
fi
|
||||||
echo $"Restoring procmail settings for $USERNAME"
|
echo $"Restoring procmail settings for $USERNAME"
|
||||||
restore_directory_from_usb /root/tempprocmail procmail/$USERNAME
|
temp_restore_dir=/root/tempprocmail
|
||||||
cp -f /root/tempprocmail/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
|
restore_directory_from_usb $temp_restore_dir procmail/$USERNAME
|
||||||
|
cp -f $temp_restore_dir/home/$USERNAME/tempbackup/.procmailrc /home/$USERNAME/
|
||||||
if [ ! "$?" = "0" ]; then
|
if [ ! "$?" = "0" ]; then
|
||||||
rm -rf /root/tempprocmail
|
rm -rf $temp_restore_dir
|
||||||
set_user_permissions
|
set_user_permissions
|
||||||
backup_unmount_drive
|
backup_unmount_drive
|
||||||
exit 276
|
exit 276
|
||||||
fi
|
fi
|
||||||
rm -rf /root/tempprocmail
|
rm -rf $temp_restore_dir
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -716,14 +719,15 @@ function restore_mailing_list {
|
||||||
fi
|
fi
|
||||||
if [ -d /var/spool/mlmmj ]; then
|
if [ -d /var/spool/mlmmj ]; then
|
||||||
echo $"Restoring public mailing list"
|
echo $"Restoring public mailing list"
|
||||||
restore_directory_from_usb /root/tempmailinglist mailinglist
|
temp_restore_dir=/root/tempmailinglist
|
||||||
cp -r /root/tempmailinglist/root/spool/mlmmj/* /var/spool/mlmmj
|
restore_directory_from_usb $temp_restore_dir mailinglist
|
||||||
|
cp -r $temp_restore_dir/root/spool/mlmmj/* /var/spool/mlmmj
|
||||||
if [ ! "$?" = "0" ]; then
|
if [ ! "$?" = "0" ]; then
|
||||||
set_user_permissions
|
set_user_permissions
|
||||||
backup_unmount_drive
|
backup_unmount_drive
|
||||||
exit 526
|
exit 526
|
||||||
fi
|
fi
|
||||||
rm -rf /root/tempmailinglist
|
rm -rf $temp_restore_dir
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue