Browse Source

Check that database backup exists

Bob Mottram 7 years ago
parent
commit
b20eec16df
2 changed files with 9 additions and 9 deletions
  1. 1
    7
      src/freedombone-app-rss
  2. 8
    2
      src/freedombone-utils-backup

+ 1
- 7
src/freedombone-app-rss View File

169
     function_check get_mariadb_password
169
     function_check get_mariadb_password
170
     get_mariadb_password
170
     get_mariadb_password
171
 
171
 
172
-    function_check rss_create_database
173
-    rss_create_database
174
-
172
+    function_check restore_database
175
     restore_database ttrss
173
     restore_database ttrss
176
 
174
 
177
     if [ -d /etc/share/tt-rss ]; then
175
     if [ -d /etc/share/tt-rss ]; then
252
         get_mariadb_password
250
         get_mariadb_password
253
 
251
 
254
         function_check restore_database_from_friend
252
         function_check restore_database_from_friend
255
-
256
-        function_check rss_create_database
257
-        rss_create_database
258
-
259
         restore_database_from_friend ttrss
253
         restore_database_from_friend ttrss
260
 
254
 
261
         if [ -d /etc/share/tt-rss ]; then
255
         if [ -d /etc/share/tt-rss ]; then

+ 8
- 2
src/freedombone-utils-backup View File

583
     DATABASE_PASSWORD=
583
     DATABASE_PASSWORD=
584
     RESTORE_SUBDIR="root"
584
     RESTORE_SUBDIR="root"
585
 
585
 
586
-    if [ -d $SERVER_DIRECTORY/backup/${1} ]; then
586
+    if [ -d $SERVER_DIRECTORY/backup/${1}data ]; then
587
         database_file_extension='sql'
587
         database_file_extension='sql'
588
         if [ $USE_MONGODB ]; then
588
         if [ $USE_MONGODB ]; then
589
             database_file_extension='mdb'
589
             database_file_extension='mdb'
666
                 fi
666
                 fi
667
             fi
667
             fi
668
         fi
668
         fi
669
+    else
670
+        echo $"No database backup found for ${1}"
671
+        exit 6239353
669
     fi
672
     fi
670
 }
673
 }
671
 
674
 
674
     restore_app_name=$1
677
     restore_app_name=$1
675
     restore_app_domain=$2
678
     restore_app_domain=$2
676
 
679
 
677
-    if [ -d $USB_MOUNT/backup/${restore_app_name} ]; then
680
+    if [ -d $USB_MOUNT/backup/${restore_app_name}data ]; then
678
         echo $"Restoring ${restore_app_name} database"
681
         echo $"Restoring ${restore_app_name} database"
679
         local_database_dir=/root/temp${restore_app_name}data
682
         local_database_dir=/root/temp${restore_app_name}data
680
         if [ -d ${local_database_dir} ]; then
683
         if [ -d ${local_database_dir} ]; then
776
                 fi
779
                 fi
777
             fi
780
             fi
778
         fi
781
         fi
782
+    else
783
+        echo $"No database backup found for ${restore_app_name}"
784
+        exit 7357224
779
     fi
785
     fi
780
 }
786
 }
781
 
787