| 
				
			 | 
			
			
				@@ -262,7 +262,7 @@ function configure_email_onion { 
			 | 
		
	
		
			
			| 
				262
			 | 
			
				262
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				263
			 | 
			
				263
			 | 
			
			
				     create_email_onion_address 
			 | 
		
	
		
			
			| 
				264
			 | 
			
				264
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				265
			 | 
			
				
			 | 
			
			
				-    #apt-get -yq install tinycdb perl 
			 | 
		
	
		
			
			| 
				
			 | 
			
				265
			 | 
			
			
				+    apt-get -yq install perl 
			 | 
		
	
		
			
			| 
				266
			 | 
			
				266
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				267
			 | 
			
				267
			 | 
			
			
				     # MX record should be: 
			 | 
		
	
		
			
			| 
				268
			 | 
			
				268
			 | 
			
			
				     # _onion-mx._tcp 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -271,9 +271,6 @@ function configure_email_onion { 
			 | 
		
	
		
			
			| 
				271
			 | 
			
				271
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				272
			 | 
			
				272
			 | 
			
			
				     # Test with: exim -d -bt username@$onion_address 
			 | 
		
	
		
			
			| 
				273
			 | 
			
				273
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				274
			 | 
			
				
			 | 
			
			
				-    #echo "$DEFAULT_DOMAIN_NAME $onion_address" > /etc/exim4/onionrelay.txt 
			 | 
		
	
		
			
			| 
				275
			 | 
			
				
			 | 
			
			
				-    #cdb -m -c -t ~/onionrelay.tmp /etc/exim4/onionrelay.cdb /etc/exim4/onionrelay.txt 
			 | 
		
	
		
			
			| 
				276
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				277
			 | 
			
				274
			 | 
			
			
				     { echo "perl_startup = do '/etc/exim4/perl-routines.pl'"; 
			 | 
		
	
		
			
			| 
				278
			 | 
			
				275
			 | 
			
			
				       echo "perl_at_start"; } > /etc/exim4/conf.d/main/00_exim4-config_perl 
			 | 
		
	
		
			
			| 
				279
			 | 
			
				276
			 | 
			
			
				  
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -290,9 +287,6 @@ function configure_email_onion { 
			 | 
		
	
		
			
			| 
				290
			 | 
			
				287
			 | 
			
			
				       echo "  return 'no_such_host';"; 
			 | 
		
	
		
			
			| 
				291
			 | 
			
				288
			 | 
			
			
				       echo "}"; } > /etc/exim4/perl-routines.pl 
			 | 
		
	
		
			
			| 
				292
			 | 
			
				289
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				293
			 | 
			
				
			 | 
			
			
				-    #{ echo "ONION_RELAYDB=/etc/exim4/onionrelay.cdb"; 
			 | 
		
	
		
			
			| 
				294
			 | 
			
				
			 | 
			
			
				-    #  echo "domainlist onion_relays     = cdb;ONION_RELAYDB"; } > /etc/exim4/conf.d/main/48_exim4-config_onion_relays 
			 | 
		
	
		
			
			| 
				295
			 | 
			
				
			 | 
			
			
				- 
			 | 
		
	
		
			
			| 
				296
			 | 
			
				290
			 | 
			
			
				     { echo "riseup:"; 
			 | 
		
	
		
			
			| 
				297
			 | 
			
				291
			 | 
			
			
				       echo "  driver    = manualroute"; 
			 | 
		
	
		
			
			| 
				298
			 | 
			
				292
			 | 
			
			
				       echo "  domains   = riseup.net"; 
			 |