Przeglądaj źródła

No separate ipfs peers page

Bob Mottram 9 lat temu
rodzic
commit
9049d5b436
1 zmienionych plików z 2 dodań i 19 usunięć
  1. 2
    19
      src/zeronetavahi

+ 2
- 19
src/zeronetavahi Wyświetl plik

@@ -47,7 +47,6 @@ fi
47 47
 
48 48
 BLOGS_FILE=$ZERONET_INSTALL/freedombone-blogs
49 49
 FORUM_FILE=$ZERONET_INSTALL/freedombone-fora
50
-IPFS_FILE=$ZERONET_INSTALL/freedombone-ipfs
51 50
 TOX_USERS_FILE=$ZERONET_INSTALL/freedombone-tox-users
52 51
 ZERONET_INDEX=/home/$MY_USERNAME/mesh.html
53 52
 ZERONET_CONFIG=$ZERONET_INSTALL/bootstrap
@@ -73,6 +72,7 @@ function create_index {
73 72
     echo '<ol type="square">' >> $ZERONET_INDEX
74 73
     echo "  <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">My Blog</a></li>" >> $ZERONET_INDEX
75 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 76
     echo '</ol>' >> $ZERONET_INDEX
77 77
     echo '' >> $ZERONET_INDEX
78 78
     echo "<H2>On the Mesh</H2>" >> $ZERONET_INDEX
@@ -81,7 +81,6 @@ function create_index {
81 81
     echo "  <li><a href=\"${BLOGS_FILE}.html\">Blogs</a></li>" >> $ZERONET_INDEX
82 82
     echo "  <li><a href=\"${FORUM_FILE}.html\">Fora</a></li>" >> $ZERONET_INDEX
83 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 84
     echo '</ol>' >> $ZERONET_INDEX
86 85
     echo '' >> $ZERONET_INDEX
87 86
     echo '</body>' >> $ZERONET_INDEX
@@ -228,23 +227,17 @@ done < "$TEMPFILE"
228 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 231
 cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
237 232
 
238 233
 state=0
239 234
 address=""
240 235
 peer=""
241
-echo '<ol type="square">' >> $IPFS_FILE.new
242 236
 while IFS='' read -r line || [[ -n "$line" ]]; do
243 237
     if [ ${state} -eq "3" ]; then
244 238
         if [[ $line == *"txt ="* ]]; then
245 239
             ipfs_peer_id=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}' | awk -F '"' '{print $2}')
246 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 241
             state=0
249 242
         fi
250 243
     fi
@@ -264,7 +257,6 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
264 257
         state=1
265 258
     fi
266 259
 done < "$TEMPFILE"
267
-echo '<ol>' >> $FORUM_FILE.new
268 260
 
269 261
 
270 262
 # detect Tox users
@@ -302,10 +294,8 @@ fi
302 294
 create_header $BLOGS_FILE "Blogs"
303 295
 create_header $FORUM_FILE "Fora"
304 296
 create_header $TOX_USERS_FILE "Tox Users"
305
-create_header $IPFS_FILE "File Shares"
306 297
 create_footer $BLOGS_FILE
307 298
 create_footer $FORUM_FILE
308
-create_footer $IPFS_FILE
309 299
 create_footer $TOX_USERS_FILE
310 300
 
311 301
 # make the index page
@@ -332,11 +322,4 @@ if [ -d $ZERONET_USER_HOME ]; then
332 322
     sudo chown zeronet:zeronet $TOX_USERS_FILE
333 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 325
 exit 0