瀏覽代碼

Entomb mesh data and logs

Bob Mottram 8 年之前
父節點
當前提交
9b00962d0b
共有 1 個檔案被更改,包括 66 行新增66 行删除
  1. 66
    66
      src/freedombone-image-mesh

+ 66
- 66
src/freedombone-image-mesh 查看文件

@@ -52,11 +52,18 @@ MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
52 52
 MESH_INSTALL_SETUP=/root/.initial_mesh_setup
53 53
 MESH_AMNESIC=/root/.amnesic
54 54
 
55
+# Tomb containing logs
56
+TOMB_LOG_SIZE_MB=32
57
+
55 58
 # size of the tomb used to store qtox settings
56 59
 TOMB_TOX_SIZE_MB=64
57 60
 
58
-# Tomb containing logs
59
-TOMB_LOG_SIZE_MB=32
61
+# Tomb containing tox bootstrap
62
+TOMB_TOX_BOOTSTRAP_SIZE_MB=32
63
+
64
+# Tomb containing zeronet
65
+TOMB_ZERONET_CONFIG_SIZE_MB=10
66
+TOMB_ZERONET_DATA_SIZE_MB=128
60 67
 
61 68
 function create_ram_disk {
62 69
 	ramdisk_size_mb=$1
@@ -111,25 +118,7 @@ function configure_zeronet {
111 118
 	echo $"zeronet daemon updated to P${PEER_ID}.local" >> $INSTALL_LOG
112 119
 }
113 120
 
114
-function remove_zeronet_blog {
115
-	blog_address=$(cat $MESH_INSTALL_DIR/zeronet/blog.txt | grep "Site address" | awk -F ':' '{print $2}')
116
-	ZERONET_BLOG_ADDRESS=${blog_address//[[:blank:]]/}
117
-	if [ -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS ]; then
118
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/*.json
119
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/*.html
120
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data/*
121
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/img/post/*
122
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/img/post
123
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/img/*
124
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS
125
-	fi
126
-}
127
-
128 121
 function configure_zeronet_blog {
129
-	if [ -f $MESH_INSTALL_COMPLETED ]; then
130
-		remove_zeronet_blog
131
-	fi
132
-
133 122
 	echo $'Updating ZeroNet Blog' >> $INSTALL_LOG
134 123
 	ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
135 124
 
@@ -207,24 +196,7 @@ function configure_zeronet_blog {
207 196
 	echo $'Update of ZeroNet Blog completed' >> $INSTALL_LOG
208 197
 }
209 198
 
210
-function remove_zeronet_mail {
211
-	mail_address=$(cat $MESH_INSTALL_DIR/zeronet/mail.txt | grep "Site address" | awk -F ':' '{print $2}')
212
-	ZERONET_MAIL_ADDRESS=${mail_address//[[:blank:]]/}
213
-	if [ -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS ]; then
214
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/*.json
215
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/*.html
216
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/users/*
217
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/users
218
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data/*
219
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS
220
-	fi
221
-}
222
-
223 199
 function configure_zeronet_mail {
224
-	if [ -f $MESH_INSTALL_COMPLETED ]; then
225
-		remove_zeronet_mail
226
-	fi
227
-
228 200
 	echo $'Updating ZeroNet Mail' >> $INSTALL_LOG
229 201
 	ZERONET_DEFAULT_MAIL_TITLE="${MY_USERNAME}'s Mail"
230 202
 
@@ -302,23 +274,7 @@ function configure_zeronet_mail {
302 274
 	echo $'Update of ZeroNet Mail completed' >> $INSTALL_LOG
303 275
 }
304 276
 
305
-function remove_zeronet_forum {
306
-	forum_address=$(cat $MESH_INSTALL_DIR/zeronet/forum.txt | grep "Site address" | awk -F ':' '{print $2}')
307
-	ZERONET_FORUM_ADDRESS=${forum_address//[[:blank:]]/}
308
-	if [ -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS ]; then
309
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/data/users/*
310
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/data/users
311
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/data/*
312
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/*.html
313
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/*.json
314
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS
315
-	fi
316
-}
317
-
318 277
 function configure_zeronet_forum {
319
-	if [ -f $MESH_INSTALL_COMPLETED ]; then
320
-		remove_zeronet_forum
321
-	fi
322 278
 	echo $'Updating ZeroNet Forum' >> $INSTALL_LOG
323 279
 	ZERONET_DEFAULT_FORUM_TITLE="${MY_USERNAME}'s Forum"
324 280
 
@@ -391,19 +347,7 @@ function configure_zeronet_forum {
391 347
 	echo $'Update of ZeroNet Forum completed' >> $INSTALL_LOG
392 348
 }
393 349
 
394
-function remove_zeronet_id {
395
-	zeroid_address=$(cat $MESH_INSTALL_DIR/zeronet/zeroid.txt | grep "Site address" | awk -F ':' '{print $2}')
396
-	ZERONET_ID_ADDRESS=${zeroid_address//[[:blank:]]/}
397
-	if [ -d $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS ]; then
398
-		shred -zu $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS/*
399
-		rm -rf $MESH_INSTALL_DIR/zeronet/data/$ZERONET_ID_ADDRESS
400
-	fi
401
-}
402
-
403 350
 function configure_zeronet_id {
404
-	if [ -f $MESH_INSTALL_COMPLETED ]; then
405
-		remove_zeronet_id
406
-	fi
407 351
 	echo $'Updating ZeroID' >> $INSTALL_LOG
408 352
 
409 353
 	cd $MESH_INSTALL_DIR/zeronet
@@ -479,6 +423,7 @@ function configure_toxcore {
479 423
 
480 424
 	echo $'Enabling toxcore daemon' >> $INSTALL_LOG
481 425
 	systemctl enable tox-bootstrapd.service
426
+
482 427
 	echo $'Regenerating Tox bootstrap node keys' >> $INSTALL_LOG
483 428
 	systemctl stop tox-bootstrapd.service
484 429
 	if [ -f /var/lib/tox-bootstrapd/keys ]; then
@@ -606,7 +551,16 @@ function setup_amnesic_data {
606 551
 	tomb_name=log
607 552
 	create_tomb ${tomb_name} $TOMB_LOG_SIZE_MB
608 553
 	if [ -d /media/${tomb_name} ]; then
609
-		INSTALL_LOG=/media/${tomb_name}/${PROJECT_NAME}.log
554
+		if [ -d /var/log ]; then
555
+			if [ ! -d /var/log_base ]; then
556
+				mv /var/log /var/log_base
557
+			fi
558
+		fi
559
+		ln -s /media/${tomb_name} /var/log
560
+		cp -rp /var/log_base/* /media/${tomb_name}
561
+		echo "${tomb_name} tomb created" >> $INSTALL_LOG
562
+	else
563
+		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
610 564
 	fi
611 565
 
612 566
 	tomb_name=tox
@@ -626,6 +580,52 @@ function setup_amnesic_data {
626 580
 		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
627 581
 	fi
628 582
 
583
+	tomb_name=zeronet-config
584
+	create_tomb ${tomb_name} $TOMB_ZERONET_CONFIG_SIZE_MB
585
+	if [ -d /media/${tomb_name} ]; then
586
+		if [ ! -d /home/${MY_USERNAME}/.config ]; then
587
+			mkdir -p /home/${MY_USERNAME}/.config
588
+		fi
589
+		if [ -d /home/${MY_USERNAME}/.config/${tomb_name} ]; then
590
+			rm -rf /home/${MY_USERNAME}/.config/${tomb_name}
591
+		fi
592
+		ln -s /media/${tomb_name} /home/${MY_USERNAME}/.config/${tomb_name}
593
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /home/${MY_USERNAME}/.config
594
+		chown -R ${MY_USERNAME}:${MY_USERNAME} /media/${tomb_name}
595
+		echo "${tomb_name} tomb created" >> $INSTALL_LOG
596
+	else
597
+		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
598
+	fi
599
+
600
+	tomb_name=zeronet-data
601
+	create_tomb ${tomb_name} $TOMB_ZERONET_DATA_SIZE_MB
602
+	if [ -d /media/${tomb_name} ]; then
603
+		if [ -d /var/lib/zeronet ]; then
604
+			if [ ! -d /var/lib/zeronet_base ]; then
605
+				mv /var/lib/zeronet /var/lib/zeronet_base
606
+			fi
607
+		fi
608
+		ln -s /media/${tomb_name} /var/lib/zeronet
609
+		cp -rp /var/lib/zeronet_base/* /media/${tomb_name}
610
+		echo "${tomb_name} tomb created" >> $INSTALL_LOG
611
+	else
612
+		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
613
+	fi
614
+
615
+	tomb_name=tox-bootstrapd
616
+	create_tomb ${tomb_name} $TOMB_TOX_BOOTSTRAP_SIZE_MB
617
+	if [ -d /media/${tomb_name} ]; then
618
+		if [ -d /var/lib/tox-bootstrapd ]; then
619
+			if [ ! -d /var/lib/tox-bootstrapd_base ]; then
620
+				mv /var/lib/tox-bootstrapd /var/lib/tox-bootstrapd_base
621
+			fi
622
+		fi
623
+		ln -s /media/${tomb_name} /var/lib/tox-bootstrapd
624
+		cp -rp /var/lib/tox-bootstrapd_base/* /media/${tomb_name}
625
+		echo "${tomb_name} tomb created" >> $INSTALL_LOG
626
+	else
627
+		echo "WARNING: ${tomb_name} tomb not found" >> $INSTALL_LOG
628
+	fi
629 629
 }
630 630
 
631 631
 # whether to reset the identity