Browse Source

Copy gpg keys before restore

Bob Mottram 9 years ago
parent
commit
d454608ec3
1 changed files with 7 additions and 6 deletions
  1. 7
    6
      src/freedombone-restore-remote

+ 7
- 6
src/freedombone-restore-remote View File

@@ -62,12 +62,6 @@ REMOTE_SERVER=$(grep -i "$SERVER_NAME" /home/${ADMIN_USERNAME}/backup.list | awk
62 62
 REMOTE_SSH_PORT=$(grep -i "$SERVER_NAME" /home/${ADMIN_USERNAME}/backup.list | awk -F ' ' '{print $2}')
63 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 65
 NOW=$(date +"%Y-%m-%d %H:%M:%S")
72 66
 
73 67
 echo "$NOW Starting restore from $REMOTE_SERVER" >> /var/log/remotebackups.log
@@ -91,6 +85,11 @@ function restore_directory_from_friend {
91 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 93
 function restore_database_from_friend {
95 94
     DATABASE_PASSWORD=
96 95
     RESTORE_SUBDIR="root"
@@ -136,6 +135,8 @@ function restore_database_from_friend {
136 135
     fi
137 136
 }
138 137
 
138
+copy_gpg_keys
139
+
139 140
 # Restore configuration files
140 141
 if [ -d $SERVER_DIRECTORY/backup/config ]; then
141 142
     echo $"Restoring configuration files"