Explorar el Código

ipfs installation

Bob Mottram hace 8 años
padre
commit
95fbcdab46
Ninguna cuenta está vinculada al correo electrónico del colaborador
Se han modificado 3 ficheros con 29 adiciones y 29 borrados
  1. 27
    27
      src/freedombone-app-ipfs
  2. 1
    1
      src/freedombone-image-customise
  3. 1
    1
      src/freedombone-image-mesh

+ 27
- 27
src/freedombone-app-ipfs Ver fichero

34
 IPFS_COMMIT='20b06a4cbce8884f5b194da6e98cb11f2c77f166'
34
 IPFS_COMMIT='20b06a4cbce8884f5b194da6e98cb11f2c77f166'
35
 IPFS_PORT=4001
35
 IPFS_PORT=4001
36
 IPFS_NODE_VERSION='6.2.2'
36
 IPFS_NODE_VERSION='6.2.2'
37
+IPFS_N_VERSION='2.1.4'
37
 IPFS_JS_VERSION='0.14.3'
38
 IPFS_JS_VERSION='0.14.3'
38
 IPFS_JS_RONIN_VERSION='0.3.11'
39
 IPFS_JS_RONIN_VERSION='0.3.11'
39
 IPFS_KEY_LENGTH=2048
40
 IPFS_KEY_LENGTH=2048
207
     fi
208
     fi
208
 
209
 
209
     chroot ${rootdir} apt-get -y install nodejs
210
     chroot ${rootdir} apt-get -y install nodejs
210
-    chroot ${rootdir} apt-get -y install npm
211
+    chroot ${rootdir} apt-get -y install npm curl
211
     chroot ${rootdir} apt-get -y install libpam0g-dev fuse
212
     chroot ${rootdir} apt-get -y install libpam0g-dev fuse
212
 
213
 
213
     if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
214
     if [ ! -f ${rootdir}/usr/bin/nodejs ]; then
215
         exit 63962
216
         exit 63962
216
     fi
217
     fi
217
 
218
 
218
-    chroot ${rootdir} ln -s /usr/bin/nodejs /usr/bin/node
219
-    chroot ${rootdir} ln -s /usr/bin/nodejs /usr/local/bin/node
220
-
221
-    chroot ${rootdir} npm cache clean -f
222
-    chroot ${rootdir} npm install -g n
223
-    chroot ${rootdir} n ${IPFS_NODE_VERSION}
224
-    chroot ${rootdir} npm install -g ronin@${IPFS_JS_RONIN_VERSION}
225
-    chroot ${rootdir} npm install -g ipfs@${IPFS_JS_VERSION}
226
-
227
-    IPFS_PATH=/usr/local/bin
219
+    cat <<EOF > ${rootdir}/root/install-ipfs.sh
220
+#!/bin/bash
221
+PATH="/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/bin"
222
+NODE_PATH="/usr/lib/node_modules"
223
+cp /usr/bin/nodejs /usr/local/bin/node
224
+cp /usr/bin/nodejs /usr/bin/node
225
+/usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
226
+npm install -g n@${IPFS_N_VERSION} --save
227
+n ${IPFS_NODE_VERSION}
228
+npm install -g ronin@${IPFS_JS_RONIN_VERSION} --save
229
+npm install -g ipfs@${IPFS_JS_VERSION} --save
230
+EOF
231
+    chroot ${rootdir} chmod +x /root/install-ipfs.sh
232
+    chroot ${rootdir} /root/install-ipfs.sh
233
+    rm -f ${rootdir}/root/install-ipfs.sh
234
+
235
+    IPFS_PATH=/usr/bin
228
 
236
 
229
     if [ ! -f ${rootdir}$IPFS_PATH/jsipfs ]; then
237
     if [ ! -f ${rootdir}$IPFS_PATH/jsipfs ]; then
230
         exit 637292
238
         exit 637292
265
     echo 'WantedBy=multi-user.target' >> $IPFS_DAEMON_FILE
273
     echo 'WantedBy=multi-user.target' >> $IPFS_DAEMON_FILE
266
 
274
 
267
     chroot ${rootdir} systemctl enable ${IPFS_DAEMON_NAME}
275
     chroot ${rootdir} systemctl enable ${IPFS_DAEMON_NAME}
268
-    chroot ${rootdir} systemctl daemon-reload
269
-
270
-    function_check create_avahi_service
271
-    create_avahi_service ipfs "ipfs" udp $IPFS_PORT "IPFS_PEER_ID"
272
 
276
 
273
     echo 'mesh install_ipfs_js' >> $COMPLETION_FILE
277
     echo 'mesh install_ipfs_js' >> $COMPLETION_FILE
274
 }
278
 }
291
         exit 63962
295
         exit 63962
292
     fi
296
     fi
293
 
297
 
294
-    ln -s /usr/bin/nodejs /usr/bin/node
295
-    ln -s /usr/bin/nodejs /usr/local/bin/node
298
+    cp /usr/bin/nodejs /usr/local/bin/node
299
+    cp /usr/bin/nodejs /usr/bin/node
300
+    /usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
301
+    /usr/local/bin/npm install -g n@${IPFS_N_VERSION}
302
+    /usr/local/bin/n ${IPFS_NODE_VERSION}
303
+    /usr/local/bin/npm install -g ronin@${IPFS_JS_RONIN_VERSION}
304
+    /usr/local/bin/npm install -g ipfs@${IPFS_JS_VERSION}
296
 
305
 
297
-    npm cache clean -f
298
-    npm install -g n
299
-    n ${IPFS_NODE_VERSION}
300
-    npm install -g ronin@${IPFS_JS_RONIN_VERSION}
301
-    npm install -g ipfs@${IPFS_JS_VERSION}
302
-
303
-    IPFS_PATH=/usr/local/bin
306
+    IPFS_PATH=/usr/bin
304
 
307
 
305
     if [ ! -f $IPFS_PATH/jsipfs ]; then
308
     if [ ! -f $IPFS_PATH/jsipfs ]; then
306
         exit 637292
309
         exit 637292
363
             echo "$IPFS_PEER_ID"
366
             echo "$IPFS_PEER_ID"
364
             exit 74782
367
             exit 74782
365
         fi
368
         fi
366
-        # Add an avahi service
367
-        function_check create_avahi_service
368
-        create_avahi_service ipfs "ipfs" udp $IPFS_PORT "$IPFS_PEER_ID"
369
         rm /tmp/ipfsid
369
         rm /tmp/ipfsid
370
     fi
370
     fi
371
 
371
 

+ 1
- 1
src/freedombone-image-customise Ver fichero

553
     install_avahi
553
     install_avahi
554
     install_batman
554
     install_batman
555
     install_tomb
555
     install_tomb
556
+    install_ipfs
556
     install_tox
557
     install_tox
557
     install_web_server
558
     install_web_server
558
-    install_ipfs
559
     if [ $ENABLE_ZERONET ]; then
559
     if [ $ENABLE_ZERONET ]; then
560
         install_zeronet
560
         install_zeronet
561
     fi
561
     fi

+ 1
- 1
src/freedombone-image-mesh Ver fichero

724
 }
724
 }
725
 
725
 
726
 function setup_ipfs {
726
 function setup_ipfs {
727
-    IPFS_PATH=/usr/local/bin
727
+    IPFS_PATH=/usr/bin
728
     IPFS_KEY_LENGTH=2048
728
     IPFS_KEY_LENGTH=2048
729
 
729
 
730
     su -c "$IPFS_PATH/jsipfs init -b $IPFS_KEY_LENGTH" - $MY_USERNAME
730
     su -c "$IPFS_PATH/jsipfs init -b $IPFS_KEY_LENGTH" - $MY_USERNAME