瀏覽代碼

Use a fixed obnam client name

Bob Mottram 8 年之前
父節點
當前提交
d79ad89c16
共有 4 個檔案被更改,包括 568 行新增532 行删除
  1. 9
    0
      src/freedombone-backup-local
  2. 541
    532
      src/freedombone-backup-remote
  3. 9
    0
      src/freedombone-restore-local
  4. 9
    0
      src/freedombone-restore-remote

+ 9
- 0
src/freedombone-backup-local 查看文件

68
     DATABASE_PASSWORD=$(cat /root/dbpass)
68
     DATABASE_PASSWORD=$(cat /root/dbpass)
69
 fi
69
 fi
70
 
70
 
71
+function set_obnam_client_name {
72
+    # obnam can backup multiple machines with different domain names to
73
+    # a repository. To be able to restore directories from different
74
+    # machines we need to enforce a single client name for all backups
75
+    echo '[config]' > /etc/obnam.conf
76
+    echo "client-name = ${PROJECT_NAME}" >> /etc/obnam.conf
77
+}
78
+
71
 function suspend_site {
79
 function suspend_site {
72
     # suspends a given website
80
     # suspends a given website
73
     if [[ $ENABLE_VERIFICATION != "yes" ]]; then
81
     if [[ $ENABLE_VERIFICATION != "yes" ]]; then
217
         if [ ! -d $USB_MOUNT/backup/${2} ]; then
225
         if [ ! -d $USB_MOUNT/backup/${2} ]; then
218
             mkdir -p $USB_MOUNT/backup/${2}
226
             mkdir -p $USB_MOUNT/backup/${2}
219
         fi
227
         fi
228
+        set_obnam_client_name
220
         obnam force-lock -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
229
         obnam force-lock -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
221
         obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
230
         obnam backup -r $USB_MOUNT/backup/${2} --encrypt-with $MY_BACKUP_KEY_ID ${1}
222
         if [[ $ENABLE_VERIFICATION == "yes" ]]; then
231
         if [[ $ENABLE_VERIFICATION == "yes" ]]; then

+ 541
- 532
src/freedombone-backup-remote
文件差異過大導致無法顯示
查看文件


+ 9
- 0
src/freedombone-restore-local 查看文件

71
 WIKI_DOMAIN_NAME=
71
 WIKI_DOMAIN_NAME=
72
 FULLBLOG_DOMAIN_NAME=
72
 FULLBLOG_DOMAIN_NAME=
73
 
73
 
74
+function set_obnam_client_name {
75
+    # obnam can backup multiple machines with different domain names to
76
+    # a repository. To be able to restore directories from different
77
+    # machines we need to enforce a single client name for all backups
78
+    echo '[config]' > /etc/obnam.conf
79
+    echo "client-name = ${PROJECT_NAME}" >> /etc/obnam.conf
80
+}
81
+
74
 function mount_drive {
82
 function mount_drive {
75
     if [ $1 ]; then
83
     if [ $1 ]; then
76
         USB_DRIVE=/dev/${1}1
84
         USB_DRIVE=/dev/${1}1
169
     if [ ! -d ${1} ]; then
177
     if [ ! -d ${1} ]; then
170
         mkdir ${1}
178
         mkdir ${1}
171
     fi
179
     fi
180
+    set_obnam_client_name
172
     obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
181
     obnam restore -r $USB_MOUNT/backup/${2} --to ${1}
173
 }
182
 }
174
 
183
 

+ 9
- 0
src/freedombone-restore-remote 查看文件

97
 # MariaDB password
97
 # MariaDB password
98
 DATABASE_PASSWORD=$(cat /root/dbpass)
98
 DATABASE_PASSWORD=$(cat /root/dbpass)
99
 
99
 
100
+function set_obnam_client_name {
101
+    # obnam can backup multiple machines with different domain names to
102
+    # a repository. To be able to restore directories from different
103
+    # machines we need to enforce a single client name for all backups
104
+    echo '[config]' > /etc/obnam.conf
105
+    echo "client-name = ${PROJECT_NAME}" >> /etc/obnam.conf
106
+}
107
+
100
 function restore_directory_from_friend {
108
 function restore_directory_from_friend {
101
     if [ ! -d ${1} ]; then
109
     if [ ! -d ${1} ]; then
102
         mkdir ${1}
110
         mkdir ${1}
103
     fi
111
     fi
112
+    set_obnam_client_name
104
     obnam restore -r $SERVER_DIRECTORY/backup/${2} --to ${1}
113
     obnam restore -r $SERVER_DIRECTORY/backup/${2} --to ${1}
105
 }
114
 }
106
 
115