Bob Mottram преди 9 години
родител
ревизия
2f2b32e347
променени са 1 файла, в които са добавени 36 реда и са изтрити 29 реда
  1. 36
    29
      src/freedombone-image-mesh

+ 36
- 29
src/freedombone-image-mesh Целия файл

@@ -54,6 +54,7 @@ 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
 
58 59
 function create_ram_disk {
59 60
 	ramdisk_size_mb=$1
@@ -580,46 +581,52 @@ function mesh_restart_daemons {
580 581
 	echo $'Daemons restarted' >> $INSTALL_LOG
581 582
 }
582 583
 
583
-function setup_amnesic_tox_data {
584
-	if [ ! -f $MESH_AMNESIC ]; then
585
-		return
586
-	fi
587
-	if [ ! -d /mnt/ramdisk ]; then
588
-		return
589
-	fi
584
+function create_tomb {
585
+	tomb_name=$1
586
+	tomb_size=$2
590 587
 
591
-	# close any existing open tomb
592
-	if [ -f /tmp/tox.tomb ]; then
593
-		tomb slam /tmp/tox.tomb
588
+	if [ -f /tmp/${tomb_name}.tomb ]; then
589
+		tomb slam /tmp/${tomb_name}.tomb
594 590
 	fi
595 591
 
596 592
 	# make a temporary password
597
-	tomb dig -s $TOMB_TOX_SIZE_MB /tmp/tox.tomb
598
-	if [ ! -f /tmp/tox.tomb ]; then
599
-		echo "WARNING: Tomb did not install properly" >> /var/log/${PROJECT_NAME}.log
593
+	tomb dig -s ${tomb_size} /tmp/${tomb_name}.tomb
594
+	if [ ! -f /tmp/${tomb_name}.tomb ]; then
595
+		echo "WARNING: ${tomb_name} tomb did not install properly" >> /var/log/${PROJECT_NAME}.log
600 596
 		tomb >> /var/log/${PROJECT_NAME}.log
601 597
 	fi
602
-	TOMB_TOX_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
603
-	tomb forge /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
604
-	tomb lock /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
605
-	tomb open /tmp/tox.tomb -k /mnt/ramdisk/tox.tomb.key --tomb-pwd "${TOMB_TOX_PASSWORD}" --unsafe
598
+	TOMB_TEMP_PASSWORD="$(openssl rand -base64 32 | cut -c1-30)"
599
+	tomb forge /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
600
+	tomb lock /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
601
+	tomb open /tmp/${tomb_name}.tomb -k /mnt/ramdisk/${tomb_name}.tomb.key --tomb-pwd "${TOMB_TEMP_PASSWORD}" --unsafe
606 602
 	# clear the temporary password
607
-	TOMB_TOX_PASSWORD=
603
+	TOMB_TEMP_PASSWORD=
608 604
 
609
-	if [ -d /media/tox ]; then
610
-		if [ ! -d /home/$MY_USERNAME/.config ]; then
611
-			mkdir -p /home/$MY_USERNAME/.config
605
+	if [ -d /media/${tomb_name} ]; then
606
+		if [ ! -d /home/${MY_USERNAME}/.config ]; then
607
+			mkdir -p /home/${MY_USERNAME}/.config
612 608
 		fi
613
-		if [ -d /home/$MY_USERNAME/.config/tox ]; then
614
-			rm -rf /home/$MY_USERNAME/.config/tox
609
+		if [ -d /home/${MY_USERNAME}/.config/${tomb_name} ]; then
610
+			rm -rf /home/${MY_USERNAME}/.config/${tomb_name}
615 611
 		fi
616
-		ln -s /media/tox /home/$MY_USERNAME/.config/tox
617
-		chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
618
-		chown -R $MY_USERNAME:$MY_USERNAME /media/tox
619
-		echo "Tox Tomb created" >> /var/log/${PROJECT_NAME}.log
612
+		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/${tomb_name}
613
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
614
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
615
+		echo "${tomb_name} tomb created" >> /var/log/${PROJECT_NAME}.log
620 616
 	else
621
-		echo "WARNING: Tox Tomb not found" >> /var/log/${PROJECT_NAME}.log
617
+		echo "WARNING: ${tomb_name} tomb not found" >> /var/log/${PROJECT_NAME}.log
618
+	fi
619
+}
620
+
621
+function setup_amnesic_data {
622
+	if [ ! -f $MESH_AMNESIC ]; then
623
+		return
622 624
 	fi
625
+	if [ ! -d /mnt/ramdisk ]; then
626
+		return
627
+	fi
628
+
629
+	create_tomb tox $TOMB_TOX_SIZE_MB
623 630
 }
624 631
 
625 632
 # whether to reset the identity
@@ -667,7 +674,7 @@ if [ -f $MESH_INSTALL_SETUP ]; then
667 674
 	configure_zeronet_mail
668 675
 	configure_zeronet_forum
669 676
 	configure_zeronet_id
670
-	setup_amnesic_tox_data
677
+	setup_amnesic_data
671 678
 	configure_toxcore
672 679
 	configure_zeronet
673 680
 	disable_password_logins