Kaynağa Gözat

Remove legacy backup variables

Bob Mottram 9 yıl önce
ebeveyn
işleme
bafed779e3
1 değiştirilmiş dosya ile 1 ekleme ve 16 silme
  1. 1
    16
      src/freedombone

+ 1
- 16
src/freedombone Dosyayı Görüntüle

260
 # name of a script which keeps running processes going even if they crash
260
 # name of a script which keeps running processes going even if they crash
261
 WATCHDOG_SCRIPT_NAME="keepon"
261
 WATCHDOG_SCRIPT_NAME="keepon"
262
 
262
 
263
-# the type of backup system used, rsync or obnam
264
-BACKUP_TYPE='obnam'
265
-
266
 # Number of days to keep backups for
263
 # Number of days to keep backups for
267
 BACKUP_MAX_DAYS=30
264
 BACKUP_MAX_DAYS=30
268
 
265
 
269
-# Location of the certificate used to encrypt backups
270
-BACKUP_CERTIFICATE=/etc/ssl/private/backup.key
271
-
272
 # memory limit for php in MB
266
 # memory limit for php in MB
273
 MAX_PHP_MEMORY=64
267
 MAX_PHP_MEMORY=64
274
 
268
 
949
       if grep -q "IPFS_PORT" $CONFIGURATION_FILE; then
943
       if grep -q "IPFS_PORT" $CONFIGURATION_FILE; then
950
           IPFS_PORT=$(grep "IPFS_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
944
           IPFS_PORT=$(grep "IPFS_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
951
       fi
945
       fi
952
-      if grep -q "BACKUP_TYPE" $CONFIGURATION_FILE; then
953
-          BACKUP_TYPE=$(grep "BACKUP_TYPE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
954
-      fi
955
       if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then
946
       if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then
956
           TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
947
           TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
957
       fi
948
       fi
1110
       if grep -q "CJDNS_PRIVATE_KEY" $CONFIGURATION_FILE; then
1101
       if grep -q "CJDNS_PRIVATE_KEY" $CONFIGURATION_FILE; then
1111
           CJDNS_PRIVATE_KEY=$(grep "CJDNS_PRIVATE_KEY" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1102
           CJDNS_PRIVATE_KEY=$(grep "CJDNS_PRIVATE_KEY" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1112
       fi
1103
       fi
1113
-      if grep -q "BACKUP_CERTIFICATE" $CONFIGURATION_FILE; then
1114
-          BACKUP_CERTIFICATE=$(grep "BACKUP_CERTIFICATE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1115
-      fi
1116
       if grep -q "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE; then
1104
       if grep -q "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE; then
1117
           ROUTER_IP_ADDRESS=$(grep "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1105
           ROUTER_IP_ADDRESS=$(grep "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1118
       fi
1106
       fi
3023
   apt-get -y remove --purge apache*
3011
   apt-get -y remove --purge apache*
3024
   apt-get -y dist-upgrade
3012
   apt-get -y dist-upgrade
3025
   apt-get -y install ca-certificates emacs24 cpulimit
3013
   apt-get -y install ca-certificates emacs24 cpulimit
3026
-  apt-get -y install rsyncrypto cryptsetup libgfshare-bin obnam sshpass
3014
+  apt-get -y install cryptsetup libgfshare-bin obnam sshpass
3027
 
3015
 
3028
   echo 'initial_setup' >> $COMPLETION_FILE
3016
   echo 'initial_setup' >> $COMPLETION_FILE
3029
 }
3017
 }
4575
   if grep -Fxq "configure_backup_key" $COMPLETION_FILE; then
4563
   if grep -Fxq "configure_backup_key" $COMPLETION_FILE; then
4576
       return
4564
       return
4577
   fi
4565
   fi
4578
-  if [[ $BACKUP_TYPE != 'obnam' ]]; then
4579
-      return
4580
-  fi
4581
   apt-get -y install gnupg
4566
   apt-get -y install gnupg
4582
 
4567
 
4583
   BACKUP_KEY_EXISTS=$(gpg_key_exists "root" "$MY_NAME (backup key)")
4568
   BACKUP_KEY_EXISTS=$(gpg_key_exists "root" "$MY_NAME (backup key)")