Selaa lähdekoodia

Copy gpg keys before restore

Bob Mottram 9 vuotta sitten
vanhempi
commit
d454608ec3
1 muutettua tiedostoa jossa 7 lisäystä ja 6 poistoa
  1. 7
    6
      src/freedombone-restore-remote

+ 7
- 6
src/freedombone-restore-remote Näytä tiedosto

62
 REMOTE_SSH_PORT=$(grep -i "$SERVER_NAME" /home/${ADMIN_USERNAME}/backup.list | awk -F ' ' '{print $2}')
62
 REMOTE_SSH_PORT=$(grep -i "$SERVER_NAME" /home/${ADMIN_USERNAME}/backup.list | awk -F ' ' '{print $2}')
63
 REMOTE_PASSWORD=$(grep -i "$SERVER_NAME" /home/${ADMIN_USERNAME}/backup.list | awk -F ' ' '{print $3}')
63
 REMOTE_PASSWORD=$(grep -i "$SERVER_NAME" /home/${ADMIN_USERNAME}/backup.list | awk -F ' ' '{print $3}')
64
 
64
 
65
-# Check that a backup key exists
66
-if [ ! -f /etc/ssl/private/backup.key ]; then
67
-    echo $'No backup key was found in /etc/ssl/private/backup.key'
68
-    exit 84
69
-fi
70
-
71
 NOW=$(date +"%Y-%m-%d %H:%M:%S")
65
 NOW=$(date +"%Y-%m-%d %H:%M:%S")
72
 
66
 
73
 echo "$NOW Starting restore from $REMOTE_SERVER" >> /var/log/remotebackups.log
67
 echo "$NOW Starting restore from $REMOTE_SERVER" >> /var/log/remotebackups.log
91
     obnam restore -r $SERVER_DIRECTORY/backup/${2} --to ${1}
85
     obnam restore -r $SERVER_DIRECTORY/backup/${2} --to ${1}
92
 }
86
 }
93
 
87
 
88
+function copy_gpg_keys {
89
+    echo $"Copying GPG keys from admin user to root"
90
+    cp -r /home/$ADMIN_USERNAME/.gnupg /root
91
+}
92
+
94
 function restore_database_from_friend {
93
 function restore_database_from_friend {
95
     DATABASE_PASSWORD=
94
     DATABASE_PASSWORD=
96
     RESTORE_SUBDIR="root"
95
     RESTORE_SUBDIR="root"
136
     fi
135
     fi
137
 }
136
 }
138
 
137
 
138
+copy_gpg_keys
139
+
139
 # Restore configuration files
140
 # Restore configuration files
140
 if [ -d $SERVER_DIRECTORY/backup/config ]; then
141
 if [ -d $SERVER_DIRECTORY/backup/config ]; then
141
     echo $"Restoring configuration files"
142
     echo $"Restoring configuration files"