|  | @@ -260,15 +260,9 @@ UPGRADE_SCRIPT_NAME="${PROJECT_NAME}-upgrade"
 | 
	
		
			
			| 260 | 260 |  # name of a script which keeps running processes going even if they crash
 | 
	
		
			
			| 261 | 261 |  WATCHDOG_SCRIPT_NAME="keepon"
 | 
	
		
			
			| 262 | 262 |  
 | 
	
		
			
			| 263 |  | -# the type of backup system used, rsync or obnam
 | 
	
		
			
			| 264 |  | -BACKUP_TYPE='obnam'
 | 
	
		
			
			| 265 |  | -
 | 
	
		
			
			| 266 | 263 |  # Number of days to keep backups for
 | 
	
		
			
			| 267 | 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 | 266 |  # memory limit for php in MB
 | 
	
		
			
			| 273 | 267 |  MAX_PHP_MEMORY=64
 | 
	
		
			
			| 274 | 268 |  
 | 
	
	
		
			
			|  | @@ -949,9 +943,6 @@ function read_configuration {
 | 
	
		
			
			| 949 | 943 |        if grep -q "IPFS_PORT" $CONFIGURATION_FILE; then
 | 
	
		
			
			| 950 | 944 |            IPFS_PORT=$(grep "IPFS_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
 | 
	
		
			
			| 951 | 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 | 946 |        if grep -q "TRACKER_PORT" $CONFIGURATION_FILE; then
 | 
	
		
			
			| 956 | 947 |            TRACKER_PORT=$(grep "TRACKER_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
 | 
	
		
			
			| 957 | 948 |        fi
 | 
	
	
		
			
			|  | @@ -1110,9 +1101,6 @@ function read_configuration {
 | 
	
		
			
			| 1110 | 1101 |        if grep -q "CJDNS_PRIVATE_KEY" $CONFIGURATION_FILE; then
 | 
	
		
			
			| 1111 | 1102 |            CJDNS_PRIVATE_KEY=$(grep "CJDNS_PRIVATE_KEY" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
 | 
	
		
			
			| 1112 | 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 | 1104 |        if grep -q "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE; then
 | 
	
		
			
			| 1117 | 1105 |            ROUTER_IP_ADDRESS=$(grep "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
 | 
	
		
			
			| 1118 | 1106 |        fi
 | 
	
	
		
			
			|  | @@ -3023,7 +3011,7 @@ function initial_setup {
 | 
	
		
			
			| 3023 | 3011 |    apt-get -y remove --purge apache*
 | 
	
		
			
			| 3024 | 3012 |    apt-get -y dist-upgrade
 | 
	
		
			
			| 3025 | 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 | 3016 |    echo 'initial_setup' >> $COMPLETION_FILE
 | 
	
		
			
			| 3029 | 3017 |  }
 | 
	
	
		
			
			|  | @@ -4575,9 +4563,6 @@ function configure_backup_key {
 | 
	
		
			
			| 4575 | 4563 |    if grep -Fxq "configure_backup_key" $COMPLETION_FILE; then
 | 
	
		
			
			| 4576 | 4564 |        return
 | 
	
		
			
			| 4577 | 4565 |    fi
 | 
	
		
			
			| 4578 |  | -  if [[ $BACKUP_TYPE != 'obnam' ]]; then
 | 
	
		
			
			| 4579 |  | -      return
 | 
	
		
			
			| 4580 |  | -  fi
 | 
	
		
			
			| 4581 | 4566 |    apt-get -y install gnupg
 | 
	
		
			
			| 4582 | 4567 |  
 | 
	
		
			
			| 4583 | 4568 |    BACKUP_KEY_EXISTS=$(gpg_key_exists "root" "$MY_NAME (backup key)")
 |