free
/
freedombone
Seguir 1
Destacar 0
Cuchillo 0
Código Incidencias 0 Peticiones pull 0 Lanzamientos 0 Wiki Activity
Explorar el Código

Copying on restore

Bob Mottram hace 10 años
padre
c9cc6ccb52
commit
bac3e4828a
Se han modificado 1 ficheros con 63 adiciones y 3 borrados
Dividir vista Mostrar estadísticas de diff
  1. 63
    3
      install-freedombone.sh

+ 63
- 3
install-freedombone.sh Ver fichero 

@@ -950,6 +950,11 @@ function create_restore_script {
950 950 
   echo '  mkdir /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
951 951 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/ssl /root/tempssl $USB_MOUNT/backup/ssl.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
952 952 
   echo '  cp -r /root/tempssl/usb/backup/ssl /etc' >> /usr/bin/$RESTORE_SCRIPT_NAME
953 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
954 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
955 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
956 
+  echo '    exit 276' >> /usr/bin/$RESTORE_SCRIPT_NAME
957 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
953 958 
   echo '  rm -rf /root/tempssl' >> /usr/bin/$RESTORE_SCRIPT_NAME
954 959 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
955 960 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -962,6 +967,11 @@ function create_restore_script {
962 967 
   echo '    rm -rf /home/$MY_USERNAME/projects' >> /usr/bin/$RESTORE_SCRIPT_NAME
963 968 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
964 969 
   echo "  mv /root/tempprojects/usb/backup/projects/$MY_USERNAME/projects /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
970 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
971 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
972 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
973 
+  echo '    exit 166' >> /usr/bin/$RESTORE_SCRIPT_NAME
974 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
965 975 
   echo '  rm -rf /root/tempprojects' >> /usr/bin/$RESTORE_SCRIPT_NAME
966 976 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
967 977 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -974,6 +984,11 @@ function create_restore_script {
974 984 
   echo '    rm -rf /home/$MY_USERNAME/personal' >> /usr/bin/$RESTORE_SCRIPT_NAME
975 985 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
976 986 
   echo "  mv /root/temppersonal/usb/backup/personal/$MY_USERNAME/personal /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
987 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
988 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
989 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
990 
+  echo '    exit 184' >> /usr/bin/$RESTORE_SCRIPT_NAME
991 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
977 992 
   echo '  rm -rf /root/temppersonal' >> /usr/bin/$RESTORE_SCRIPT_NAME
978 993 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
979 994 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -983,6 +998,11 @@ function create_restore_script {
983 998 
   echo '  mkdir /root/tempmailinglist' >> /usr/bin/$RESTORE_SCRIPT_NAME
984 999 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mailinglist /root/tempmailinglist $USB_MOUNT/backup/mailinglist.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
985 1000 
   echo "  cp -r /root/tempmailinglist/usb/backup/mailinglist/spool/mlmmj/* $PUBLIC_MAILING_LIST_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
1001 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1002 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1003 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1004 
+  echo '    exit 526' >> /usr/bin/$RESTORE_SCRIPT_NAME
1005 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
986 1006 
   echo '  rm -rf /root/tempmailinglist' >> /usr/bin/$RESTORE_SCRIPT_NAME
987 1007 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
988 1008 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -992,6 +1012,11 @@ function create_restore_script {
992 1012 
   echo '  mkdir /root/tempxmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
993 1013 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/xmpp /root/tempxmpp $USB_MOUNT/backup/xmpp.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
994 1014 
   echo "  cp -r /root/tempxmpp/usb/backup/xmpp/lib/prosody/* $XMPP_DIRECTORY" >> /usr/bin/$RESTORE_SCRIPT_NAME
1015 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1016 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1017 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1018 
+  echo '    exit 725' >> /usr/bin/$RESTORE_SCRIPT_NAME
1019 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
995 1020 
   echo '  rm -rf /root/tempxmpp' >> /usr/bin/$RESTORE_SCRIPT_NAME
996 1021 
   echo '  service prosody restart' >> /usr/bin/$RESTORE_SCRIPT_NAME
997 1022 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1050,6 +1075,11 @@ function create_restore_script {
1050 1075 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1051 1076 
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/gnusocial /root/tempgnusocial $USB_MOUNT/backup/gnusocial.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1052 1077 
       echo "  cp -r /root/tempgnusocial/usb/backup/gnusocial/www/$MICROBLOG_DOMAIN_NAME/htdocs /var/www/$MICROBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1078 
+      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1079 
+      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1080 
+      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1081 
+      echo '    exit 683' >> /usr/bin/$RESTORE_SCRIPT_NAME
1082 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1053 1083 
       echo '  rm -rf /root/tempgnusocial' >> /usr/bin/$RESTORE_SCRIPT_NAME
1054 1084 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1055 1085 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1085,6 +1115,11 @@ function create_restore_script {
1085 1115 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1086 1116 
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/redmatrix /root/tempredmatrix $USB_MOUNT/backup/redmatrix.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1087 1117 
       echo "  cp -r /root/tempredmatrix/usb/backup/redmatrix/www/$REDMATRIX_DOMAIN_NAME/htdocs /var/www/$REDMATRIX_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1118 
+      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1119 
+      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1120 
+      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1121 
+      echo '    exit 759' >> /usr/bin/$RESTORE_SCRIPT_NAME
1122 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1088 1123 
       echo '  rm -rf /root/tempredmatrix' >> /usr/bin/$RESTORE_SCRIPT_NAME
1089 1124 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1090 1125 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1117,7 +1152,12 @@ function create_restore_script {
1117 1152 
       echo '    mkdir /root/tempowncloud' >> /usr/bin/$RESTORE_SCRIPT_NAME
1118 1153 
       echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1119 1154 
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/owncloud /root/tempowncloud $USB_MOUNT/backup/owncloud.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1120 
-      echo "  cp -r /root/tempowncloud/usb/backup/owncloud/www/$OWNCLOUD_DOMAIN_NAME/htdocs /var/www/$OWNCLOUD_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1155 
+      echo "  cp -r /root/tempowncloud/usb/backup/owncloud/www/$OWNCLOUD_DOMAIN_NAME/htdocs/* /var/www/$OWNCLOUD_DOMAIN_NAME/htdocs/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1156 
+      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1157 
+      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1158 
+      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1159 
+      echo '    exit 981' >> /usr/bin/$RESTORE_SCRIPT_NAME
1160 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1121 1161 
       echo '  rm -rf /root/tempowncloud' >> /usr/bin/$RESTORE_SCRIPT_NAME
1122 1162 
       echo '  rm -rf /root/tempownclouddata' >> /usr/bin/$RESTORE_SCRIPT_NAME
1123 1163 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1129,7 +1169,12 @@ function create_restore_script {
1129 1169 
       echo '  echo "Restoring Wiki installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1130 1170 
       echo '  mkdir /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
1131 1171 
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/wiki /root/tempwiki $USB_MOUNT/backup/wiki.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1132 
-      echo "  cp -r /root/tempwiki/usb/backup/wiki/www/$WIKI_DOMAIN_NAME/htdocs /var/www/$WIKI_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1172 
+      echo "  cp -r /root/tempwiki/usb/backup/wiki/www/$WIKI_DOMAIN_NAME/htdocs/* /var/www/$WIKI_DOMAIN_NAME/htdocs/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1173 
+      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1174 
+      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1175 
+      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1176 
+      echo '    exit 868' >> /usr/bin/$RESTORE_SCRIPT_NAME
1177 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1133 1178 
       echo '  rm -rf /root/tempwiki' >> /usr/bin/$RESTORE_SCRIPT_NAME
1134 1179 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1135 1180 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1140,7 +1185,12 @@ function create_restore_script {
1140 1185 
       echo '  echo "Restoring blog installation"' >> /usr/bin/$RESTORE_SCRIPT_NAME
1141 1186 
       echo '  mkdir /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
1142 1187 
       echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/blog /root/tempblog $USB_MOUNT/backup/blog.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1143 
-      echo "  cp -r /root/tempblog/usb/backup/blog/www/$FULLBLOG_DOMAIN_NAME/htdocs /var/www/$FULLBLOG_DOMAIN_NAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1188 
+      echo "  cp -r /root/tempblog/usb/backup/blog/www/$FULLBLOG_DOMAIN_NAME/htdocs/* /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/" >> /usr/bin/$RESTORE_SCRIPT_NAME
1189 
+      echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1190 
+      echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1191 
+      echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1192 
+      echo '    exit 593' >> /usr/bin/$RESTORE_SCRIPT_NAME
1193 
+      echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1144 1194 
       echo '  rm -rf /root/tempblog' >> /usr/bin/$RESTORE_SCRIPT_NAME
1145 1195 
       echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1146 1196 
       echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1151,6 +1201,11 @@ function create_restore_script {
1151 1201 
   echo '  mkdir /root/tempmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
1152 1202 
   echo "  rsyncrypto -v -d -r $USB_MOUNT/backup/mail /root/tempmail $USB_MOUNT/backup/mail.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1153 1203 
   echo "  cp -r /root/tempmail/usb/backup/blog/$MY_USERNAME/Maildir /home/$MY_USERNAME" >> /usr/bin/$RESTORE_SCRIPT_NAME
1204 
+  echo '  if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1205 
+  echo "    umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1206 
+  echo "    rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1207 
+  echo '    exit 927' >> /usr/bin/$RESTORE_SCRIPT_NAME
1208 
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1154 1209 
   echo '  rm -rf /root/tempmail' >> /usr/bin/$RESTORE_SCRIPT_NAME
1155 1210 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1156 1211 
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -1161,6 +1216,11 @@ function create_restore_script {
1161 1216 
   echo '    mkdir /root/tempdlna' >> /usr/bin/$RESTORE_SCRIPT_NAME
1162 1217 
   echo "    rsyncrypto -v -d -r $USB_MOUNT/backup/dlna /root/tempdlna $USB_MOUNT/backup/dlna.keys $BACKUP_CERTIFICATE" >> /usr/bin/$RESTORE_SCRIPT_NAME
1163 1218 
   echo "    cp -r /root/tempdlna/usb/backup/dlna/cache/minidlna /var/cache" >> /usr/bin/$RESTORE_SCRIPT_NAME
1219 
+  echo '    if [ ! "$?" = "0" ]; then' >> /usr/bin/$RESTORE_SCRIPT_NAME
1220 
+  echo "      umount $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1221 
+  echo "      rm -rf $USB_MOUNT" >> /usr/bin/$RESTORE_SCRIPT_NAME
1222 
+  echo '      exit 982' >> /usr/bin/$RESTORE_SCRIPT_NAME
1223 
+  echo '    fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1164 1224 
   echo '    rm -rf /root/tempdlna' >> /usr/bin/$RESTORE_SCRIPT_NAME
1165 1225 
   echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
1166 1226 
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME