free
/
freedombone
Observar 1
Favorito 0
Fork 0
Código Issues 0 Pull Requests 0 Versões 0 Wiki Atividade
Ver código fonte

misc files

Bob Mottram 10 anos atrás
pai
95e402e439
commit
870ac2ca7f
1 arquivos alterados com 14 adições e 9 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 14
    9
      install-freedombone.sh

+ 14
- 9
install-freedombone.sh Ver arquivo 

@@ -902,8 +902,8 @@ function create_restore_script {
902 902 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
903 903
904 904 
   if [[ $BACKUP_INCLUDES_DATABASES == "yes" ]]; then
905 
-      echo 'echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
906 905 
       echo "if [ ! -d $USB_MOUNT/backup/mariadb ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
906 
+      echo '    echo "Restoring mysql settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
907 907 
       echo '    if [ ! -d /root/tempmariadb ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
908 908 
       echo '        mkdir /root/tempmariadb' >> /usr/bin/$RESTORE_SCRIPT_NAME
909 909 
       echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -930,7 +930,7 @@ function create_restore_script {
930 930 
   echo '  echo "Restoring certificates"' >> /usr/bin/$RESTORE_SCRIPT_NAME
931 931 
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
932 932 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/ssl /root/tempssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
933 
-  echo '  mv /root/tempssl/usb/backup/ssl /etc' >> /usr/bin/$RESTORE_SCRIPT_NAME
933 
+  echo '  cp -r /root/tempssl/usb/backup/ssl /etc' >> /usr/bin/$RESTORE_SCRIPT_NAME
934 934 
   echo '  rm -rf /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
935 935 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
936 936 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -939,6 +939,9 @@ function create_restore_script {
939 939 
   echo '  echo "Restoring projects"' >> /usr/bin/$RESTORE_SCRIPT_NAME
940 940 
   echo '  mkdir /root/tempprojects' >> /usr/bin/$RESTORE_SCRIPT_NAME
941 941 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/projects /root/tempprojects $USB_MOUNT/backup/projects.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
942 
+  echo "  if [ -d /home/$MY_USERNAME/projects ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
943 
+  echo '    rm -rf /home/$MY_USERNAME/projects' >> /usr/bin/$RESTORE_SCRIPT_NAME
944 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
942 945 
   echo "  mv /root/tempprojects/usb/backup/projects/$MY_USERNAME/projects /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
943 946 
   echo '  rm -rf /root/tempprojects' >> /usr/bin/$RESTORE_SCRIPT_NAME
944 947 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -948,6 +951,9 @@ function create_restore_script {
948 951 
   echo '  echo "Restoring personal settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
949 952 
   echo '  mkdir /root/temppersonal' >> /usr/bin/$RESTORE_SCRIPT_NAME
950 953 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/personal /root/temppersonal $USB_MOUNT/backup/personal.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
954 
+  echo "  if [ -d /home/$MY_USERNAME/personal ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
955 
+  echo '    rm -rf /home/$MY_USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
956 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
951 957 
   echo "  mv /root/temppersonal/usb/backup/personal/$MY_USERNAME/personal /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
952 958 
   echo '  rm -rf /root/temppersonal' >> /usr/bin/$RESTORE_SCRIPT_NAME
953 959 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -957,7 +963,7 @@ function create_restore_script {
957 963 
   echo '  echo "Restoring public mailing list"' >> /usr/bin/$RESTORE_SCRIPT_NAME
958 964 
   echo '  mkdir /root/tempmailinglist' >> /usr/bin/$RESTORE_SCRIPT_NAME
959 965 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mailinglist /root/tempmailinglist $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
960 
-  echo "  mv /root/tempmailinglist/usb/backup/mailinglist/spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
966 
+  echo "  cp -r /root/tempmailinglist/usb/backup/mailinglist/spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
961 967 
   echo '  rm -rf /root/tempmailinglist' >> /usr/bin/$RESTORE_SCRIPT_NAME
962 968 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
963 969 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -966,7 +972,7 @@ function create_restore_script {
966 972 
   echo '  echo "Restoring XMPP settings"' >> /usr/bin/$RESTORE_SCRIPT_NAME
967 973 
   echo '  mkdir /root/tempxmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
968 974 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/xmpp /root/tempxmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
969 
-  echo "  mv /root/tempxmpp/usb/backup/xmpp/lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
975 
+  echo "  cp -r /root/tempxmpp/usb/backup/xmpp/lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
970 976 
   echo '  rm -rf /root/tempxmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
971 977 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
972 978 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -982,11 +988,14 @@ function create_restore_script {
982 988 
   echo "  mkdir -p /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
983 989 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
984 990 
   echo "rsyncrypto -v -d -r $USB_MOUNT/backup/misc /home/$MY_USERNAME/tempfiles $USB_MOUNT/backup/misc.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
985 
-  echo "tar -xzvf /home/$MY_USERNAME/tempfiles/usb/backup/misc/miscfiles.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
991 
+  echo "tar -xzvf /home/$MY_USERNAME/tempfiles/usb/backup/misc/$MY_USERNAME/tempfiles/miscfiles.tar.gz -C /" >> /usr/bin/$RESTORE_SCRIPT_NAME
986 992 
   echo "chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
987 993 
   echo 'if [ -d /home/$MY_USERNAME/.gnupg ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
988 994 
   echo '  cp -r /home/$MY_USERNAME/.gnupg /root' >> /usr/bin/$RESTORE_SCRIPT_NAME
989 995 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
996 
+  echo 'echo "Removing temporary files"' >> /usr/bin/$RESTORE_SCRIPT_NAME
997 
+  echo "rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
998 
+  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
990 999 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
991 1000
992 1001 
   if grep -Fxq "install_gnu_social" $COMPLETION_FILE; then
 
@@ -1094,10 +1103,6 @@ function create_restore_script {
1094 1103 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1095 1104 
   fi
1096 1105
1097 
-  echo 'echo "Removing temporary files"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1098 
-  echo "rm -rf /home/$MY_USERNAME/tempfiles" >> /usr/bin/$RESTORE_SCRIPT_NAME
1099 
-  echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
1100 
-
1101 1106 
   echo "if [ -d $USB_MOUNT/backup/mail ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
1102 1107 
   echo '  echo "Restoring emails"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1103 1108 
   echo '  mkdir /root/tempmail' >> /usr/bin/$RESTORE_SCRIPT_NAME