|
@@ -872,28 +872,35 @@ function create_restore_script {
|
872
|
872
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
873
|
873
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
874
|
874
|
|
875
|
|
- echo "if [ ! -f $BACKUP_CERTIFICATE ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
876
|
|
- echo " if [ -f $USB_MOUNT/backup/key.gpg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
877
|
|
- echo " if [ -f $BACKUP_CERTIFICATE.new ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
878
|
|
- echo " rm $BACKUP_CERTIFICATE.new" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
879
|
|
- echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
880
|
|
- echo " cp $USB_MOUNT/backup/key.gpg /root/tempbackupkey.gpg" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
881
|
|
- echo " gpg /root/tempbackupkey.gpg" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
882
|
|
- echo " if [ -f /root/tempbackupkey ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
883
|
|
- echo ' echo "Backup key decrypted"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
884
|
|
- echo " cp /root/tempbackupkey $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
885
|
|
- echo " shred -zu /root/tempbackupkey" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
886
|
|
- echo " chmod 400 $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
887
|
|
- echo ' else' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
888
|
|
- echo ' echo "Unable to decrypt the backup key"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
889
|
|
- echo ' exit 735' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
890
|
|
- echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
875
|
+ echo 'echo "Copying GPG keys to root"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
876
|
+ echo "cp -r /home/$MY_USERNAME/.gnupg /root"
|
|
877
|
+ echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
878
|
+
|
|
879
|
+ echo "if [ -f $USB_MOUNT/backup/key.gpg ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
880
|
+ echo " if [ -f $BACKUP_CERTIFICATE.new ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
881
|
+ echo " rm $BACKUP_CERTIFICATE.new" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
882
|
+ echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
883
|
+ echo " cp $USB_MOUNT/backup/key.gpg /root/tempbackupkey.gpg" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
884
|
+ echo " gpg /root/tempbackupkey.gpg" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
885
|
+ echo " if [ -f /root/tempbackupkey ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
886
|
+ echo ' echo "Backup key decrypted"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
887
|
+ echo " cp /root/tempbackupkey $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
888
|
+ echo " shred -zu /root/tempbackupkey" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
889
|
+ echo " chmod 400 $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
890
|
+ echo ' echo "Backup certificate installed"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
891
|
+ echo ' else' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
892
|
+ echo ' echo "Unable to decrypt the backup key"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
893
|
+ echo " umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
894
|
+ echo " rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
895
|
+ echo ' exit 735' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
891
|
896
|
echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
892
|
897
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
893
|
898
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
894
|
899
|
|
895
|
900
|
echo "if [ ! -f $BACKUP_CERTIFICATE ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
896
|
901
|
echo " echo 'No backup key was found. Copy your backup key to $BACKUP_CERTIFICATE'" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
902
|
+ echo " umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
903
|
+ echo " rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
897
|
904
|
echo ' exit 563' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
898
|
905
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
899
|
906
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -926,14 +933,6 @@ function create_restore_script {
|
926
|
933
|
echo ' rm -rf /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
927
|
934
|
echo ' echo "Restarting database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
928
|
935
|
echo ' service mysql restart' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
929
|
|
- #echo ' echo "Apply the new MariaDB user table"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
930
|
|
- #echo ' mysqlsuccess=$(mysql -u root --password=$DATABASE_PASSWORD "flush privileges;")' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
931
|
|
- #echo ' if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
932
|
|
- #echo ' echo "$mysqlsuccess"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
933
|
|
- #echo " umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
934
|
|
- #echo " rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
935
|
|
- #echo ' exit 963' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
936
|
|
- #echo ' fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
937
|
936
|
echo ' echo "Change the MariaDB password to the backup version"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
938
|
937
|
echo ' DATABASE_PASSWORD=$BACKUP_MARIADB_PASSWORD' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
939
|
938
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|