Parcourir la source

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram il y a 7 ans
Parent
révision
daf0499a47
3 fichiers modifiés avec 15 ajouts et 5 suppressions
  1. 4
    4
      doc/EN/mesh_images.org
  2. 6
    1
      src/freedombone-app-cryptpad
  3. 5
    0
      src/freedombone-image-customise

+ 4
- 4
doc/EN/mesh_images.org Voir le fichier

45
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
45
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
46
 gpg --verify freedombone-meshclient-i386.img.xz.sig
46
 gpg --verify freedombone-meshclient-i386.img.xz.sig
47
 sha256sum freedombone-meshclient-i386.img.xz
47
 sha256sum freedombone-meshclient-i386.img.xz
48
-3e88205461bb2061dc172ff0a1e65e5cae1013f8f7dc26c6d5cbe1c986c98555
48
+49391230de6a4f1966db091813deb8f9d93c947677f5483baa52400d7fcba7d3
49
 unxz freedombone-meshclient-i386.img.xz
49
 unxz freedombone-meshclient-i386.img.xz
50
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
50
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
51
 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
51
 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
61
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
61
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
62
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
62
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
63
 sha256sum freedombone-meshclient-insecure-i386.img.xz
63
 sha256sum freedombone-meshclient-insecure-i386.img.xz
64
-09c059664daf56d210134735d37e8117bb7b755acc8b9b253cdfa42052249ccb
64
+066ef17f90078de8ae85807fa0207f5e3b994a74442cb0683a3bbce1a1b6253b
65
 unxz freedombone-meshclient-insecure-i386.img.xz
65
 unxz freedombone-meshclient-insecure-i386.img.xz
66
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
66
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
67
 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync
67
 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync
82
 wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig
82
 wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig
83
 gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
83
 gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
84
 sha256sum freedombone-mesh_beaglebone-armhf.img.xz
84
 sha256sum freedombone-mesh_beaglebone-armhf.img.xz
85
-60017999340a6559d1de76f3d78d9771c11de5eeefb3d3b812747ce306251e67
85
+ad8f22c0d46c98a80aa47b5809402971cf5cf26ebf587c59a667307b2386c3d2
86
 unxz freedombone-mesh_beaglebone-armhf.img.xz
86
 unxz freedombone-mesh_beaglebone-armhf.img.xz
87
 sudo dd bs=1M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync
87
 sudo dd bs=1M if=freedombone-mesh_beaglebone-armhf.img of=/dev/sdX conv=fdatasync
88
 #+end_src
88
 #+end_src
102
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
102
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
103
 gpg --verify freedombone.tar.gz.sig
103
 gpg --verify freedombone.tar.gz.sig
104
 sha256sum freedombone.tar.gz
104
 sha256sum freedombone.tar.gz
105
-3d2a7f2bd7a3475832756b7bb63b96ba5fc4a4f4d7bffe86e685be9a3b41b958
105
+
106
 tar -xzvf freedombone.tar.gz
106
 tar -xzvf freedombone.tar.gz
107
 cd freedombone
107
 cd freedombone
108
 git checkout stretch
108
 git checkout stretch

+ 6
- 1
src/freedombone-app-cryptpad Voir le fichier

330
     echo '        //logFeedback: true,' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js
330
     echo '        //logFeedback: true,' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js
331
     echo '        //logRPC: true,' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js
331
     echo '        //logRPC: true,' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js
332
     echo '};' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js
332
     echo '};' >> $cryptpad_prefix$CRYPTPAD_DIR/config.js
333
-    chown cryptpad:cryptpad $cryptpad_prefix$CRYPTPAD_DIR/config.js
333
+
334
+    if [[ "$cryptpad_install_type" != "mesh" ]]; then
335
+        chown cryptpad:cryptpad $cryptpad_prefix$CRYPTPAD_DIR/config.js
336
+    else
337
+        chroot "$rootdir" chown cryptpad:cryptpad $CRYPTPAD_DIR/config.js
338
+    fi
334
 }
339
 }
335
 
340
 
336
 function mesh_install_cryptpad {
341
 function mesh_install_cryptpad {

+ 5
- 0
src/freedombone-image-customise Voir le fichier

701
     install_web_server
701
     install_web_server
702
     mesh_install_scuttlebot
702
     mesh_install_scuttlebot
703
     #install_ferment
703
     #install_ferment
704
+
705
+    chroot "$rootdir" apt-get clean
706
+    chroot "$rootdir" /bin/rm -rf /var/lib/apt/lists/*
707
+    chroot "$rootdir" apt-get clean
708
+
704
     install_ipfs
709
     install_ipfs
705
     install_tox
710
     install_tox
706
     install_pelican
711
     install_pelican