Просмотр исходного кода

Backup and restore password store

Bob Mottram 8 лет назад
Родитель
Сommit
818282650c

+ 1
- 0
src/freedombone-backup-local Просмотреть файл

@@ -204,6 +204,7 @@ function backup_directories {
204 204
         "/var/spool/mlmmj,                      mailinglist"
205 205
         "/etc/nginx/sites-available,            web"
206 206
         "/var/lib/tor,                          tor"
207
+        "/root/.passwords,                      passwordstore"
207 208
     )
208 209
 
209 210
     for dr in "${backup_dirs[@]}"

+ 8
- 0
src/freedombone-backup-remote Просмотреть файл

@@ -249,6 +249,13 @@ function backup_letsencrypt {
249 249
     fi
250 250
 }
251 251
 
252
+function backup_passwordstore {
253
+    if [ -d /root/.passwords ]; then
254
+        echo $"Backing up password store"
255
+        backup_directory_to_friend /root/.passwords passwordstore
256
+    fi
257
+}
258
+
252 259
 function backup_tor {
253 260
     if [ -d /etc/letsencrypt ]; then
254 261
         echo $"Backing up Tor settings"
@@ -376,6 +383,7 @@ backup_configfiles
376 383
 if [[ $TEST_MODE == "no" ]]; then
377 384
     backup_users
378 385
     backup_letsencrypt
386
+    backup_passwordstore
379 387
     backup_tor
380 388
     backup_web_server
381 389
     backup_admin_readme

+ 1
- 0
src/freedombone-controlpanel Просмотреть файл

@@ -887,6 +887,7 @@ function restore_data_from_storage {
887 887
     utils_installed=(configfiles
888 888
                      mariadb
889 889
                      letsencrypt
890
+                     passwords
890 891
                      mutt
891 892
                      gpg
892 893
                      procmail

+ 13
- 0
src/freedombone-restore-local Просмотреть файл

@@ -227,6 +227,18 @@ function restore_letsencrypt {
227 227
     fi
228 228
 }
229 229
 
230
+function restore_passwordstore {
231
+    if [[ $RESTORE_APP != 'all' ]]; then
232
+        if [[ $RESTORE_APP != 'passwords' ]]; then
233
+            return
234
+        fi
235
+    fi
236
+    if [ -d $USB_MOUNT/backup/passwordstore ]; then
237
+        echo $"Restoring password store"
238
+        restore_directory_from_usb / passwordstore
239
+    fi
240
+}
241
+
230 242
 function restore_tor {
231 243
     if [[ $RESTORE_APP != 'all' ]]; then
232 244
         if [[ $RESTORE_APP != 'tor' ]]; then
@@ -713,6 +725,7 @@ restore_configfiles
713 725
 same_admin_user
714 726
 restore_mariadb
715 727
 restore_letsencrypt
728
+restore_passwordstore
716 729
 restore_tor
717 730
 restore_mutt_settings
718 731
 restore_gpg

+ 13
- 0
src/freedombone-restore-remote Просмотреть файл

@@ -219,6 +219,18 @@ function restore_letsencrypt {
219 219
     fi
220 220
 }
221 221
 
222
+function restore_passwordstore {
223
+    if [[ $RESTORE_APP != 'all' ]]; then
224
+        if [[ $RESTORE_APP != 'passwords' ]]; then
225
+            return
226
+        fi
227
+    fi
228
+    if [ -d $SERVER_DIRECTORY/backup/passwordstore ]; then
229
+        echo $"Restoring password store"
230
+        restore_directory_from_friend / passwordstore
231
+    fi
232
+}
233
+
222 234
 function restore_tor {
223 235
     if [[ $RESTORE_APP != 'all' ]]; then
224 236
         if [[ $RESTORE_APP != 'tor' ]]; then
@@ -649,6 +661,7 @@ copy_gpg_keys
649 661
 restore_configfiles
650 662
 restore_mariadb
651 663
 restore_letsencrypt
664
+restore_passwordstore
652 665
 restore_mutt_settings
653 666
 restore_gpg
654 667
 restore_procmail