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

doc/EN/mesh_images.org

@@ -45,7 +45,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
 gpg --verify freedombone-meshclient-i386.img.xz.sig
 sha256sum freedombone-meshclient-i386.img.xz
-6dcf7418d6bd7dbe79f5fcf96f83b48eb59f6c11a50b67c5e2c013195751989e
+376668ae375518af268d67b9ccb7ab7b2c2787b445c125f61487ff97950092e8
 unxz freedombone-meshclient-i386.img.xz
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
@@ -61,7 +61,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
 sha256sum freedombone-meshclient-insecure-i386.img.xz
-4e9ee5fc5aa11fa58bcceae7f04f017c005a4a2595c0d64ac49de39f88b6590d
+81098572ac522b543f2c015dd0819d27c290b93b771efc9de6e93742e3981daf
 unxz freedombone-meshclient-insecure-i386.img.xz
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync

src/freedombone-image-customise

@@ -927,30 +927,32 @@ if [ \$no_of_users -gt 0 ]; then
     chmod +x /home/$MY_USERNAME/Desktop/Users.desktop
     chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/Users.desktop
 
-    if [ ! -f /home/$MY_USERNAME/Desktop/cryptpad.desktop ]; then
-        echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Name=CryptPad' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[el]=Συνεργατική επεξεργασία εγγράφων σε πραγματικό χρόνο' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[ar]=في الوقت الحقيقي التحرير التعاوني للوثائق' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[ca]=Edició col·laborativa en temps real de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[hi]=दस्तावेज़ों का रीयलटाइम सहयोगी संपादन' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[fr]=Edition collaborative en temps réel de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[de]=Kollaboratives Echtzeit-Editing von Dokumenten' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[es]=Edición colaborativa en tiempo real de documentos' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        chmod +x /home/$MY_USERNAME/Desktop/cryptpad.desktop
-        chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/cryptpad.desktop
-    else
-        if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
-            sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
+    if [ ! -f /home/$MY_USERNAME/.cryptpad.desktop ]; then
+        if [ ! -f /home/$MY_USERNAME/Desktop/cryptpad.desktop ]; then
+            echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Name=CryptPad' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[el]=Συνεργατική επεξεργασία εγγράφων σε πραγματικό χρόνο' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[ar]=في الوقت الحقيقي التحرير التعاوني للوثائق' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[ca]=Edició col·laborativa en temps real de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[hi]=दस्तावेज़ों का रीयलटाइम सहयोगी संपादन' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[fr]=Edition collaborative en temps réel de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[de]=Kollaboratives Echtzeit-Editing von Dokumenten' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[es]=Edición colaborativa en tiempo real de documentos' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            chmod +x /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/cryptpad.desktop
+        else
+            if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
+                sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
+            fi
         fi
     fi
 

src/freedombone-mesh-batman

@@ -261,6 +261,21 @@ function mesh_create_app_downloads_page {
     if [ ! -d /var/www/html ]; then
         return
     fi
+    # Don't go straight to cryptpad when navigating to the peer's IP address
+    if [ -L /etc/nginx/sites-enabled/cryptpad ]; then
+        rm /etc/nginx/sites-enabled/cryptpad
+        ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+        if [ -d /etc/cryptpad ]; then
+            systemctl stop cryptpad
+            systemctl disable cryptpad
+        fi
+        systemctl restart nginx
+    fi
+    # Don't show the cryptpad icon on the desktop
+    if [ -f /home/fbone/Desktop/cryptpad.desktop ]; then
+        mv /home/fbone/Desktop/cryptpad.desktop /home/fbone/.cryptpad.desktop
+    fi
+
     cp /root/$PROJECT_NAME/website/EN/meshindex.html /var/www/html/index.html
     if [ ! -f /var/www/html/ssb.apk ]; then
         cp /root/$PROJECT_NAME/image_build/mesh_apps/ssb.apk /var/www/html/ssb.apk
@@ -361,6 +376,23 @@ function start {
         systemctl enable hostapd
         systemctl restart hostapd
         mesh_create_app_downloads_page
+    else
+        # Recreate the cryptpad symlink
+        if [ -f /etc/nginx/sites-available/cryptpad ]; then
+            if [ -L /etc/nginx/sites-enabled/cryptpad ]; then
+                rm /etc/nginx/sites-enabled/default
+            fi
+            systemctl enable cryptpad
+            systemctl start cryptpad
+
+            if [ ! -L /etc/nginx/sites-enabled/cryptpad ]; then
+                ln -s /etc/nginx/sites-available/cryptpad /etc/nginx/sites-enabled/cryptpad
+                systemctl restart nginx
+            fi
+        fi
+        if [ -f /home/fbone/.cryptpad.desktop ]; then
+            mv /home/fbone/.cryptpad.desktop /home/fbone/Desktop/cryptpad.desktop
+        fi
     fi
 
     iptables -A INPUT -p icmp --icmp-type echo-request -j ACCEPT

website/EN/mesh_images.html

@@ -3,7 +3,7 @@
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
-<!-- 2017-10-30 Mon 12:14 -->
+<!-- 2017-11-10 Fri 13:13 -->
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 <title>&lrm;</title>
@@ -246,13 +246,13 @@ for the JavaScript code in this tag.
 
 <center><h1>Mesh Network: Images</h1></center>
 
-<div id="outline-container-orgbb633ca" class="outline-2">
-<h2 id="orgbb633ca">Pre-built Disk Images</h2>
-<div class="outline-text-2" id="text-orgbb633ca">
+<div id="outline-container-org6d0027e" class="outline-2">
+<h2 id="org6d0027e">Pre-built Disk Images</h2>
+<div class="outline-text-2" id="text-org6d0027e">
 </div>
-<div id="outline-container-org2ed661a" class="outline-3">
-<h3 id="org2ed661a">Writing many images quickly</h3>
-<div class="outline-text-3" id="text-org2ed661a">
+<div id="outline-container-orgaaf029b" class="outline-3">
+<h3 id="orgaaf029b">Writing many images quickly</h3>
+<div class="outline-text-3" id="text-orgaaf029b">
 <p>
 There may be situations where you need to write the same disk image to multiple drives at the same time in order to maximize rate of deployment. In the instructions given below the <b>dd</b> command is used for writing to the target drive, but to write to multiple drives you can use a tool such as <a href="https://wiki.gnome.org/Apps/MultiWriter">GNOME MultiWriter</a>.
 </p>
@@ -280,9 +280,9 @@ The MultiWriter tool is also available within mesh client images, so that you ca
 </p>
 </div>
 </div>
-<div id="outline-container-orgac03b6d" class="outline-3">
-<h3 id="orgac03b6d">Client images</h3>
-<div class="outline-text-3" id="text-orgac03b6d">
+<div id="outline-container-orgc0ddf07" class="outline-3">
+<h3 id="orgc0ddf07">Client images</h3>
+<div class="outline-text-3" id="text-orgc0ddf07">
 <div class="org-center">
 
 <div class="figure">
@@ -301,7 +301,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.x
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
 gpg --verify freedombone-meshclient-i386.img.xz.sig
 sha256sum freedombone-meshclient-i386.img.xz
-6dcf7418d6bd7dbe79f5fcf96f83b48eb59f6c11a50b67c5e2c013195751989e
+376668ae375518af268d67b9ccb7ab7b2c2787b445c125f61487ff97950092e8
 unxz freedombone-meshclient-i386.img.xz
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
@@ -322,7 +322,7 @@ wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
 sha256sum freedombone-meshclient-insecure-i386.img.xz
-4e9ee5fc5aa11fa58bcceae7f04f017c005a4a2595c0d64ac49de39f88b6590d
+81098572ac522b543f2c015dd0819d27c290b93b771efc9de6e93742e3981daf
 unxz freedombone-meshclient-insecure-i386.img.xz
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-insecure-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
@@ -331,16 +331,16 @@ sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-n
 </div>
 </div>
 
-<div id="outline-container-orgab65b99" class="outline-3">
-<h3 id="orgab65b99">Router images</h3>
-<div class="outline-text-3" id="text-orgab65b99">
+<div id="outline-container-org8eb2396" class="outline-3">
+<h3 id="org8eb2396">Router images</h3>
+<div class="outline-text-3" id="text-org8eb2396">
 <p>
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
 </p>
 </div>
-<div id="outline-container-orgf1035dc" class="outline-4">
-<h4 id="orgf1035dc">Beaglebone Black</h4>
-<div class="outline-text-4" id="text-orgf1035dc">
+<div id="outline-container-orgd7fdd98" class="outline-4">
+<h4 id="orgd7fdd98">Beaglebone Black</h4>
+<div class="outline-text-4" id="text-orgd7fdd98">
 <div class="org-center">
 
 <div class="figure">
@@ -359,7 +359,7 @@ wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf
 wget https://freedombone.net/downloads/current/freedombone-mesh_beaglebone-armhf.img.xz.sig
 gpg --verify freedombone-mesh_beaglebone-armhf.img.xz.sig
 sha256sum freedombone-mesh_beaglebone-armhf.img.xz
-45f131995e2f77188e7ddaf2b42ca3d8d48d821d37c7a31a21e2e6dcceaf510d
+60017999340a6559d1de76f3d78d9771c11de5eeefb3d3b812747ce306251e67
 unxz freedombone-mesh_beaglebone-armhf.img.xz
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-mesh_beaglebone-armhf.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
 </pre>
@@ -377,9 +377,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
 </div>
 </div>
 
-<div id="outline-container-org9976d21" class="outline-2">
-<h2 id="org9976d21">Building Disk Images</h2>
-<div class="outline-text-2" id="text-org9976d21">
+<div id="outline-container-org6584d9d" class="outline-2">
+<h2 id="org6584d9d">Building Disk Images</h2>
+<div class="outline-text-2" id="text-org6584d9d">
 <p>
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
 </p>
@@ -394,7 +394,7 @@ wget https://freedombone.net/downloads/current/freedombone.tar.gz
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
 gpg --verify freedombone.tar.gz.sig
 sha256sum freedombone.tar.gz
-024aedd3a264e963d791daaada347aba1295bc5caebba34ad9b19dc117a8cac9
+3d2a7f2bd7a3475832756b7bb63b96ba5fc4a4f4d7bffe86e685be9a3b41b958
 tar -xzvf freedombone.tar.gz
 <span class="org-builtin">cd</span> freedombone
 git checkout stretch