Bladeren bron

If in amnesic mode put the log into its own tomb

Bob Mottram 8 jaren geleden
bovenliggende
commit
b47c62be6b
1 gewijzigde bestanden met toevoegingen van 23 en 24 verwijderingen
  1. 23
    24
      src/freedombone-image-mesh

+ 23
- 24
src/freedombone-image-mesh Bestand weergeven

@@ -54,7 +54,9 @@ MESH_AMNESIC=/root/.amnesic
54 54
 
55 55
 # size of the tomb used to store qtox settings
56 56
 TOMB_TOX_SIZE_MB=64
57
-TOMB_ZERONET_SIZE_MB=64
57
+
58
+# Tomb containing logs
59
+TOMB_LOG_SIZE_MB=32
58 60
 
59 61
 function create_ram_disk {
60 62
 	ramdisk_size_mb=$1
@@ -535,16 +537,6 @@ function mesh_amnesic {
535 537
 	echo '' >> /usr/bin/amnesic
536 538
 	echo 'tomb slam all' >> /usr/bin/amnesic
537 539
 	echo '' >> /usr/bin/amnesic
538
-	echo "if [ -d /home/${MY_USERNAME}/.config/tox ]; then" >> /usr/bin/amnesic
539
-	echo "    rm -rf /home/${MY_USERNAME}/.config/tox" >> /usr/bin/amnesic
540
-	echo 'fi' >> /usr/bin/amnesic
541
-	echo '' >> /usr/bin/amnesic
542
-	echo 'if [ -f /tmp/tox.tomb ]; then' >> /usr/bin/amnesic
543
-	echo '    rm -f /tmp/tox.tomb' >> /usr/bin/amnesic
544
-	echo 'fi' >> /usr/bin/amnesic
545
-	echo '' >> /usr/bin/amnesic
546
-	echo "shred -zu /var/log/${PROJECT_NAME}*" >> /usr/bin/amnesic
547
-	echo '' >> /usr/bin/amnesic
548 540
 	echo 'MY_USERNAME=$1' >> /usr/bin/amnesic
549 541
 	echo -n "${PROJECT_NAME}-image-mesh " >> /usr/bin/amnesic
550 542
 	echo '$MY_USERNAME amnesic' >> /usr/bin/amnesic
@@ -601,7 +593,24 @@ function create_tomb {
601 593
 	tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
602 594
 	# clear the temporary password
603 595
 	TOMB_TEMP_PASSWORD=
596
+}
597
+
598
+function setup_amnesic_data {
599
+	if [ ! -f $MESH_AMNESIC ]; then
600
+		return
601
+	fi
602
+	if [ ! -d /mnt/ramdisk ]; then
603
+		return
604
+	fi
604 605
 
606
+	tomb_name=log
607
+	create_tomb ${tomb_name} $TOMB_LOG_SIZE_MB
608
+	if [ -d /media/${tomb_name} ]; then
609
+		INSTALL_LOG=/media/${tomb_name}/${PROJECT_NAME}.log
610
+	fi
611
+
612
+	tomb_name=tox
613
+	create_tomb ${tomb_name} $TOMB_TOX_SIZE_MB
605 614
 	if [ -d /media/${tomb_name} ]; then
606 615
 		if [ ! -d /home/${MY_USERNAME}/.config ]; then
607 616
 			mkdir -p /home/${MY_USERNAME}/.config
@@ -612,21 +621,11 @@ function create_tomb {
612 621
 		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/${tomb_name}
613 622
 		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
614 623
 		chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
615
-		echo "${tomb_name} tomb created" >> /var/log/${PROJECT_NAME}.log
624
+		echo "${tomb_name} tomb created" >> $INSTALL_LOG
616 625
 	else
617
-		echo "WARNING: ${tomb_name} tomb not found" >> /var/log/${PROJECT_NAME}.log
626
+		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
618 627
 	fi
619
-}
620 628
 
621
-function setup_amnesic_data {
622
-	if [ ! -f $MESH_AMNESIC ]; then
623
-		return
624
-	fi
625
-	if [ ! -d /mnt/ramdisk ]; then
626
-		return
627
-	fi
628
-
629
-	create_tomb tox $TOMB_TOX_SIZE_MB
630 629
 }
631 630
 
632 631
 # whether to reset the identity
@@ -668,13 +667,13 @@ if [ -f $MESH_INSTALL_SETUP ]; then
668 667
 	tomb slam all
669 668
 	enable_batman_daemon
670 669
 	create_ram_disk 1
670
+	setup_amnesic_data
671 671
 	change_avahi_name
672 672
 	regenerate_ssh_host_keys
673 673
 	configure_zeronet_blog
674 674
 	configure_zeronet_mail
675 675
 	configure_zeronet_forum
676 676
 	configure_zeronet_id
677
-	setup_amnesic_data
678 677
 	configure_toxcore
679 678
 	configure_zeronet
680 679
 	disable_password_logins