|
@@ -978,6 +978,7 @@ function create_restore_script {
|
978
|
978
|
echo " rsyncrypto -v -d -r $USB_MOUNT/backup/xmpp /root/tempxmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
979
|
979
|
echo " cp -r /root/tempxmpp/usb/backup/xmpp/lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
980
|
980
|
echo ' rm -rf /root/tempxmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
981
|
+ echo ' service prosody restart' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
981
|
982
|
echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
982
|
983
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
983
|
984
|
|
|
@@ -1002,7 +1003,10 @@ function create_restore_script {
|
1002
|
1003
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1003
|
1004
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1004
|
1005
|
|
|
1006
|
+ BACKUP_INCLUDES_WEBSITES="no"
|
|
1007
|
+
|
1005
|
1008
|
if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
|
|
1009
|
+ BACKUP_INCLUDES_WEBSITES="yes"
|
1006
|
1010
|
echo "if [ -d $USB_MOUNT/backup/gnusocial ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1007
|
1011
|
echo ' echo "Restoring microblog database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1008
|
1012
|
echo ' if [ ! -d /root/tempgnusocialdata ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -1031,6 +1035,7 @@ function create_restore_script {
|
1031
|
1035
|
fi
|
1032
|
1036
|
|
1033
|
1037
|
if grep -Fxq "install_redmatrix" $COMPLETION_FILE; then
|
|
1038
|
+ BACKUP_INCLUDES_WEBSITES="yes"
|
1034
|
1039
|
echo "if [ -d $USB_MOUNT/backup/redmatrix ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1035
|
1040
|
echo ' echo "Restoring Red Matrix database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1036
|
1041
|
echo ' if [ ! -d /root/tempredmatrixdata ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -1059,6 +1064,7 @@ function create_restore_script {
|
1059
|
1064
|
fi
|
1060
|
1065
|
|
1061
|
1066
|
if grep -Fxq "install_owncloud" $COMPLETION_FILE; then
|
|
1067
|
+ BACKUP_INCLUDES_WEBSITES="yes"
|
1062
|
1068
|
echo "if [ -d $USB_MOUNT/backup/owncloud ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1063
|
1069
|
echo ' echo "Restoring owncloud database"' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1064
|
1070
|
echo ' if [ ! -d /root/tempownclouddata ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -1128,8 +1134,17 @@ function create_restore_script {
|
1128
|
1134
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1129
|
1135
|
|
1130
|
1136
|
echo 'sync' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1137
|
+ echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1138
|
+ echo "# Unmount the USB drive" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1131
|
1139
|
echo "umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1132
|
1140
|
echo "rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1141
|
+ echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1142
|
+ if [[ $BACKUP_INCLUDES_WEBSITES == "yes" ]]; then
|
|
1143
|
+ echo "# Restart the web server" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1144
|
+ echo "service nginx restart" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1145
|
+ echo "service php5-fpm restart" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
1146
|
+ fi
|
|
1147
|
+ echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1133
|
1148
|
echo 'echo "Restore from USB drive is complete. You can now remove it."' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1134
|
1149
|
echo 'exit 0' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
1135
|
1150
|
chmod 400 /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -1188,6 +1203,7 @@ function backup_to_friends_servers {
|
1188
|
1203
|
echo "if [ ! -d /home/$MY_USERNAME/tempfiles ]; then" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
1189
|
1204
|
echo " mkdir /home/$MY_USERNAME/tempfiles" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
1190
|
1205
|
echo 'fi' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
|
1206
|
+
|
1191
|
1207
|
if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
|
1192
|
1208
|
echo 'if [ -f /var/backups/gnusocial_daily.sql ]; then' >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|
1193
|
1209
|
echo " cp /var/backups/gnusocial_daily.sql /home/$MY_USERNAME/tempfiles/gnusocial.sql" >> /usr/bin/$BACKUP_TO_FRIENDS_SCRIPT_NAME
|