浏览代码

No separate ipfs peers page

Bob Mottram 9 年前
父节点
当前提交
9049d5b436
共有 1 个文件被更改,包括 2 次插入19 次删除
  1. 2
    19
      src/zeronetavahi

+ 2
- 19
src/zeronetavahi 查看文件

47
 
47
 
48
 BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
48
 BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
50
-IPFS_FILE=$ZERONET_INSTALL/freedombone-ipfs
51
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
50
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
52
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
51
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
53
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
52
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
73
     echo '<ol type="square">' >> $ZERONET_INDEX
72
     echo '<ol type="square">' >> $ZERONET_INDEX
74
     echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">My Blog</a></li>" >> $ZERONET_INDEX
73
     echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">My Blog</a></li>" >> $ZERONET_INDEX
75
     echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myforum)\">My Forum</a></li>" >> $ZERONET_INDEX
74
     echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myforum)\">My Forum</a></li>" >> $ZERONET_INDEX
75
+    echo "  <li><a href=\"http://localhost:5001/ipfs/webui\">File Share</a></li>" >> $ZERONET_INDEX
76
     echo '</ol>' >> $ZERONET_INDEX
76
     echo '</ol>' >> $ZERONET_INDEX
77
     echo '' >> $ZERONET_INDEX
77
     echo '' >> $ZERONET_INDEX
78
     echo "<H2>On the Mesh</H2>" >> $ZERONET_INDEX
78
     echo "<H2>On the Mesh</H2>" >> $ZERONET_INDEX
81
     echo "  <li><a href=\"${BLOGS_FILE}.html\">Blogs</a></li>" >> $ZERONET_INDEX
81
     echo "  <li><a href=\"${BLOGS_FILE}.html\">Blogs</a></li>" >> $ZERONET_INDEX
82
     echo "  <li><a href=\"${FORUM_FILE}.html\">Fora</a></li>" >> $ZERONET_INDEX
82
     echo "  <li><a href=\"${FORUM_FILE}.html\">Fora</a></li>" >> $ZERONET_INDEX
83
     echo "  <li><a href=\"${TOX_USERS_FILE}.html\">Tox Users</a></li>" >> $ZERONET_INDEX
83
     echo "  <li><a href=\"${TOX_USERS_FILE}.html\">Tox Users</a></li>" >> $ZERONET_INDEX
84
-    echo "  <li><a href=\"${IPFS_FILE}.html\">File shares</a></li>" >> $ZERONET_INDEX
85
     echo '</ol>' >> $ZERONET_INDEX
84
     echo '</ol>' >> $ZERONET_INDEX
86
     echo '' >> $ZERONET_INDEX
85
     echo '' >> $ZERONET_INDEX
87
     echo '</body>' >> $ZERONET_INDEX
86
     echo '</body>' >> $ZERONET_INDEX
228
 echo '<ol>' >> $FORUM_FILE.new
227
 echo '<ol>' >> $FORUM_FILE.new
229
 
228
 
230
 
229
 
231
-# detect IPFS file shares in the mesh
232
-if [ -f $IPFS_FILE.new ]; then
233
-    rm -f $IPFS_FILE.new
234
-fi
235
-
230
+# IPFS bootstrap
236
 cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
231
 cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
237
 
232
 
238
 state=0
233
 state=0
239
 address=""
234
 address=""
240
 peer=""
235
 peer=""
241
-echo '<ol type="square">' >> $IPFS_FILE.new
242
 while IFS='' read -r line || [[ -n "$line" ]]; do
236
 while IFS='' read -r line || [[ -n "$line" ]]; do
243
     if [ ${state} -eq "3" ]; then
237
     if [ ${state} -eq "3" ]; then
244
         if [[ $line == *"txt ="* ]]; then
238
         if [[ $line == *"txt ="* ]]; then
245
             ipfs_peer_id=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}' | awk -F '"' '{print $2}')
239
             ipfs_peer_id=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}' | awk -F '"' '{print $2}')
246
             ipfs bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
240
             ipfs bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
247
-            echo "  <li><a href=\"http://localhost:5001/ipfs/${ipfs_peer_id}\">${peer}</a></li>" >> $IPFS_FILE.new
248
             state=0
241
             state=0
249
         fi
242
         fi
250
     fi
243
     fi
264
         state=1
257
         state=1
265
     fi
258
     fi
266
 done < "$TEMPFILE"
259
 done < "$TEMPFILE"
267
-echo '<ol>' >> $FORUM_FILE.new
268
 
260
 
269
 
261
 
270
 # detect Tox users
262
 # detect Tox users
302
 create_header $BLOGS_FILE "Blogs"
294
 create_header $BLOGS_FILE "Blogs"
303
 create_header $FORUM_FILE "Fora"
295
 create_header $FORUM_FILE "Fora"
304
 create_header $TOX_USERS_FILE "Tox Users"
296
 create_header $TOX_USERS_FILE "Tox Users"
305
-create_header $IPFS_FILE "File Shares"
306
 create_footer $BLOGS_FILE
297
 create_footer $BLOGS_FILE
307
 create_footer $FORUM_FILE
298
 create_footer $FORUM_FILE
308
-create_footer $IPFS_FILE
309
 create_footer $TOX_USERS_FILE
299
 create_footer $TOX_USERS_FILE
310
 
300
 
311
 # make the index page
301
 # make the index page
332
     sudo chown zeronet:zeronet $TOX_USERS_FILE
322
     sudo chown zeronet:zeronet $TOX_USERS_FILE
333
 fi
323
 fi
334
 
324
 
335
-# create a web page showing the file shares
336
-cat ${IPFS_FILE}-header.html ${IPFS_FILE}.new ${IPFS_FILE}-footer.html > ${IPFS_FILE}.html
337
-rm -f ${IPFS_FILE}.new
338
-if [ -d $ZERONET_USER_HOME ]; then
339
-    sudo chown zeronet:zeronet $IPFS_FILE
340
-fi
341
-
342
 exit 0
325
 exit 0