|
|
@@ -27,9 +27,9 @@ TRACKER_PORT=6969
|
|
27
|
27
|
MY_USERNAME=$USER
|
|
28
|
28
|
ZERONET_DIR=/home/$MY_USERNAME/zeronet
|
|
29
|
29
|
UPDATED="no"
|
|
30
|
|
-ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
|
|
31
|
|
-ZERONET_DEFAULT_FORUM_TAGLINE="A decentralized discussion group"
|
|
32
|
|
-ZERONET_DEFAULT_MAIL_TAGLINE="Mail for the Mesh"
|
|
|
30
|
+ZERONET_DEFAULT_BLOG_TAGLINE=$"Blogging on the Mesh"
|
|
|
31
|
+ZERONET_DEFAULT_FORUM_TAGLINE=$"A decentralized discussion group"
|
|
|
32
|
+ZERONET_DEFAULT_MAIL_TAGLINE=$"Mail for the Mesh"
|
|
33
|
33
|
|
|
34
|
34
|
IPFS_PORT=4001
|
|
35
|
35
|
|
|
|
@@ -117,7 +117,7 @@ function install_zeronet_blog {
|
|
117
|
117
|
exit 736
|
|
118
|
118
|
fi
|
|
119
|
119
|
|
|
120
|
|
- ZERONET_DEFAULT_BLOG_TITLE="${MY_USERNAME}'s Blog"
|
|
|
120
|
+ ZERONET_DEFAULT_BLOG_TITLE=$"${MY_USERNAME}'s Blog"
|
|
121
|
121
|
|
|
122
|
122
|
cd $ZERONET_DIR
|
|
123
|
123
|
python zeronet.py --batch siteCreate 2> $ZERONET_DIR/blog.txt
|
|
|
@@ -154,8 +154,8 @@ function install_zeronet_blog {
|
|
154
|
154
|
echo $'ZeroBlog repo could not be cloned'
|
|
155
|
155
|
exit 6739
|
|
156
|
156
|
fi
|
|
157
|
|
- cd /opt/zeronet/ZeroBlog
|
|
158
|
|
- git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT
|
|
|
157
|
+ cd /opt/zeronet/ZeroBlog
|
|
|
158
|
+ git checkout $ZERONET_BLOG_COMMIT -b $ZERONET_BLOG_COMMIT
|
|
159
|
159
|
|
|
160
|
160
|
echo $"Blog address: $ZERONET_BLOG_ADDRESS"
|
|
161
|
161
|
echo $"Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
|
|
|
@@ -209,11 +209,11 @@ function install_zeronet_mail {
|
|
209
|
209
|
fi
|
|
210
|
210
|
|
|
211
|
211
|
if [ ! -d /etc/avahi ]; then
|
|
212
|
|
- echo 'Avahi is not installed'
|
|
|
212
|
+ echo $'Avahi is not installed'
|
|
213
|
213
|
exit 736
|
|
214
|
214
|
fi
|
|
215
|
215
|
|
|
216
|
|
- ZERONET_DEFAULT_MAIL_TITLE="${MY_USERNAME}'s Mail"
|
|
|
216
|
+ ZERONET_DEFAULT_MAIL_TITLE=$"${MY_USERNAME}'s Mail"
|
|
217
|
217
|
|
|
218
|
218
|
cd /opt/zeronet
|
|
219
|
219
|
python zeronet.py --batch siteCreate 2> /opt/zeronet/mail.txt
|
|
|
@@ -247,7 +247,7 @@ function install_zeronet_mail {
|
|
247
|
247
|
|
|
248
|
248
|
git clone $ZERONET_MAIL_REPO ZeroMail
|
|
249
|
249
|
if [ ! -d /opt/zeronet/ZeroMail ]; then
|
|
250
|
|
- echo 'ZeroMail repo could not be cloned'
|
|
|
250
|
+ echo $'ZeroMail repo could not be cloned'
|
|
251
|
251
|
exit 6739
|
|
252
|
252
|
fi
|
|
253
|
253
|
cd /opt/zeronet/ZeroMail
|
|
|
@@ -292,6 +292,8 @@ function install_zeronet_mail {
|
|
292
|
292
|
echo "ZeroNet Mail address: $ZERONET_MAIL_ADDRESS" >> /home/$MY_USERNAME/README
|
|
293
|
293
|
echo "ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY" >> /home/$MY_USERNAME/README
|
|
294
|
294
|
fi
|
|
|
295
|
+
|
|
|
296
|
+ echo $'Zeronet mail installed'
|
|
295
|
297
|
}
|
|
296
|
298
|
|
|
297
|
299
|
function install_zeronet_forum {
|
|
|
@@ -345,10 +347,10 @@ function install_zeronet_forum {
|
|
345
|
347
|
echo $'ZeroTalk repo could not be cloned'
|
|
346
|
348
|
exit 6739
|
|
347
|
349
|
fi
|
|
348
|
|
- cd /opt/zeronet/ZeroTalk
|
|
349
|
|
- git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT
|
|
|
350
|
+ cd /opt/zeronet/ZeroTalk
|
|
|
351
|
+ git checkout $ZERONET_FORUM_COMMIT -b $ZERONET_FORUM_COMMIT
|
|
350
|
352
|
|
|
351
|
|
- echo $"Forum address: $ZERONET_FORUM_ADDRESS"
|
|
|
353
|
+ echo $"Forum address: $ZERONET_FORUM_ADDRESS"
|
|
352
|
354
|
echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
|
|
353
|
355
|
cp -r $ZERONET_DIR/ZeroTalk/* $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS
|
|
354
|
356
|
sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" $ZERONET_DIR/data/$ZERONET_FORUM_ADDRESS/index.html
|
|
|
@@ -428,8 +430,8 @@ function install_zeronet {
|
|
428
|
430
|
if [ ! -d $ZERONET_DIR ]; then
|
|
429
|
431
|
exit 56823
|
|
430
|
432
|
fi
|
|
431
|
|
- cd $ZERONET_DIR
|
|
432
|
|
- git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT
|
|
|
433
|
+ cd $ZERONET_DIR
|
|
|
434
|
+ git checkout $ZERONET_COMMIT -b $ZERONET_COMMIT
|
|
433
|
435
|
#cd $ZERONET_DIR
|
|
434
|
436
|
#git checkout bashrc/bootstrap-file
|
|
435
|
437
|
# Hack to ensure that the file access port is opened
|
|
|
@@ -460,7 +462,7 @@ if [[ $SERVER_INSTALLATION == "no" ]]; then
|
|
460
|
462
|
install_zeronet_blog
|
|
461
|
463
|
install_zeronet_mail
|
|
462
|
464
|
install_zeronet_forum
|
|
463
|
|
- install_ipfs
|
|
|
465
|
+ #install_ipfs
|
|
464
|
466
|
sudo batman start
|
|
465
|
467
|
if [ ! "$?" = "0" ]; then
|
|
466
|
468
|
exit 2
|
Bob Mottram
hace 9 años