|
@@ -779,6 +779,11 @@ function create_restore_script {
|
779
|
779
|
fi
|
780
|
780
|
apt-get -y --force-yes install rsyncrypto
|
781
|
781
|
|
|
782
|
+ get_mariadb_password
|
|
783
|
+ get_mariadb_gnusocial_admin_password
|
|
784
|
+ get_mariadb_redmatrix_admin_password
|
|
785
|
+ get_mariadb_owncloud_admin_password
|
|
786
|
+
|
782
|
787
|
echo '#!/bin/bash' > /usr/bin/$RESTORE_SCRIPT_NAME
|
783
|
788
|
echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
|
784
|
789
|
echo "if [ ! -b $USB_DRIVE ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
|
|
@@ -949,7 +954,7 @@ function backup_to_friends_servers {
|
949
|
954
|
return
|
950
|
955
|
fi
|
951
|
956
|
|
952
|
|
- apt-get -y --force-yes install duplicity
|
|
957
|
+ apt-get -y --force-yes install rsyncrypto
|
953
|
958
|
|
954
|
959
|
get_mariadb_password
|
955
|
960
|
get_mariadb_gnusocial_admin_password
|
|
@@ -1138,6 +1143,13 @@ function restore_from_friend {
|
1138
|
1143
|
return
|
1139
|
1144
|
fi
|
1140
|
1145
|
|
|
1146
|
+ apt-get -y --force-yes install rsyncrypto
|
|
1147
|
+
|
|
1148
|
+ get_mariadb_password
|
|
1149
|
+ get_mariadb_gnusocial_admin_password
|
|
1150
|
+ get_mariadb_redmatrix_admin_password
|
|
1151
|
+ get_mariadb_owncloud_admin_password
|
|
1152
|
+
|
1141
|
1153
|
if ! grep -q "restore from a friend's server" /home/$MY_USERNAME/README; then
|
1142
|
1154
|
echo '' >> /home/$MY_USERNAME/README
|
1143
|
1155
|
echo '' >> /home/$MY_USERNAME/README
|