free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switch to using master branch for installs and upgrades

This commit is contained in:
Bob Mottram 2016-11-24 10:50:25 +00:00
parent 851d44c5be
commit bd74ed4be5
9 changed files with 48 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/EN/beaglebone.org
View File

@ -39,7 +39,6 @@ On your laptop or desktop prepare a microSD card image as follows. To create an
sudo apt-get install git
git clone https://github.com/bashrc/freedombone
cd freedombone
git checkout stockholm
sudo make install
freedombone-image --setup debian
#+end_src
@ -50,7 +49,6 @@ Or on Arch/Parabola:
sudo pacman -S git
git clone https://github.com/bashrc/freedombone
cd freedombone
git checkout stockholm
sudo make install
freedombone-image --setup parabola
#+end_src

2
doc/EN/homeserver.org
View File

@ -23,7 +23,6 @@ First install freedombone onto your local system (not the target hardware that y
sudo apt-get install git
git clone https://github.com/bashrc/freedombone
cd freedombone
git checkout stockholm
sudo make install
freedombone-image --setup debian
freedombone-image -t i386 --onion yes
@ -35,7 +34,6 @@ Or on Arch/Parabola:
sudo pacman -S git
git clone https://github.com/bashrc/freedombone
cd freedombone
git checkout stockholm
sudo make install
freedombone-image --setup parabola
freedombone-image -t i386 --onion yes

1
doc/EN/mesh.org
View File

@ -117,7 +117,6 @@ sha256sum freedombone-mesh-13-09-2016.tar.gz
3e279f8ed762afb682bec6bd463830087354dd2f24020f3b0de51143585ab0ed
tar -xzvf freedombone-mesh-13-09-2016.tar.gz
cd freedombone
git checkout stockholm
sudo make install
freedombone-image -t i386 -v meshclient
#+end_src

2
src/freedombone-image
View File

@ -234,7 +234,7 @@ function image_setup {
cd $USERHOME/develop/multipath-tools
makepkg --force --noconfirm
makepkg -i --force --noconfirm
sudo wget https://raw.githubusercontent.com/bashrc/freedombone/stockholm/image_build/debootstrap/scripts/${DEBIAN_VERSION} -O /usr/share/debootstrap/scripts/debscript
sudo wget https://raw.githubusercontent.com/bashrc/freedombone/master/image_build/debootstrap/scripts/${DEBIAN_VERSION} -O /usr/share/debootstrap/scripts/debscript
sudo cp -f /usr/share/debootstrap/scripts/debscript /usr/share/debootstrap/scripts/${DEBIAN_VERSION}
if [ ! -f /usr/share/debootstrap/scripts/${DEBIAN_VERSION} ]; then
echo $"No debian debootstrap script was found for $DEBIAN_VERSION"

1
src/freedombone-image-customise
View File

@ -1033,7 +1033,6 @@ sed -i "s|host-name=.*|host-name=${PROJECT_NAME}|g" $rootdir/etc/avahi/avahi-dae
chroot "$rootdir" /bin/bash -x <<EOF
git clone $PROJECT_REPO /root/$PROJECT_NAME
cd /root/$PROJECT_NAME
git checkout origin/stockholm -b stockholm
make install
EOF

3
src/freedombone-upgrade
View File

@ -52,8 +52,7 @@ done
read_config_param PROJECT_REPO
read_config_param DEVELOPMENT_BRANCH
# TODO change this after release
DEVELOPMENT_BRANCH=stockholm
DEVELOPMENT_BRANCH=master
write_config_param "DEVELOPMENT_BRANCH" "$DEVELOPMENT_BRANCH"
if [ $DEVELOPMENT_BRANCH ]; then

4
website/EN/beaglebone.html
View File

@ -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>
<!-- 2016-11-24 Thu 10:26 -->
<!-- 2016-11-24 Thu 10:49 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title></title>
@ -284,7 +284,6 @@ On your laptop or desktop prepare a microSD card image as follows. To create an
<pre class="src src-bash">sudo apt-get install git
git clone https://github.com/bashrc/freedombone
<span class="org-builtin">cd</span> freedombone
git checkout stockholm
sudo make install
freedombone-image --setup debian
</pre>
@ -298,7 +297,6 @@ Or on Arch/Parabola:
<pre class="src src-bash">sudo pacman -S git
git clone https://github.com/bashrc/freedombone
<span class="org-builtin">cd</span> freedombone
git checkout stockholm
sudo make install
freedombone-image --setup parabola
</pre>

4
website/EN/homeserver.html
View File

@ -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>
<!-- 2016-11-23 Wed 23:02 -->
<!-- 2016-11-24 Thu 10:49 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title></title>
@ -258,7 +258,6 @@ First install freedombone onto your local system (not the target hardware that y
<pre class="src src-bash">sudo apt-get install git
git clone https://github.com/bashrc/freedombone
<span class="org-builtin">cd</span> freedombone
git checkout stockholm
sudo make install
freedombone-image --setup debian
freedombone-image -t i386 --onion yes
@ -273,7 +272,6 @@ Or on Arch/Parabola:
<pre class="src src-bash">sudo pacman -S git
git clone https://github.com/bashrc/freedombone
<span class="org-builtin">cd</span> freedombone
git checkout stockholm
sudo make install
freedombone-image --setup parabola
freedombone-image -t i386 --onion yes

89
website/EN/mesh.html
View File

@ -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>
<!-- 2016-10-31 Mon 16:23 -->
<!-- 2016-11-24 Thu 10:49 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title></title>
@ -273,13 +273,13 @@ for the JavaScript code in this tag.
</colgroup>
<tbody>
<tr>
<td class="org-left"><a href="#org99ea1c9">What the system can do</a></td>
<td class="org-left"><a href="#orgdb7a57b">What the system can do</a></td>
<td class="org-left">-</td>
<td class="org-left"><a href="#org5cc91dd">Disk Images</a></td>
<td class="org-left"><a href="#orgc804016">Disk Images</a></td>
<td class="org-left">-</td>
<td class="org-left"><a href="#org8badd4f">Building Disk Images</a></td>
<td class="org-left"><a href="#org1af89bc">Building Disk Images</a></td>
<td class="org-left">-</td>
<td class="org-left"><a href="#orgb35f622">How to use it</a></td>
<td class="org-left"><a href="#orgf19b78f">How to use it</a></td>
</tr>
</tbody>
</table>
@ -288,9 +288,9 @@ for the JavaScript code in this tag.
Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.
</p>
<div id="outline-container-org99ea1c9" class="outline-2">
<h2 id="org99ea1c9">What the system can do</h2>
<div class="outline-text-2" id="text-org99ea1c9">
<div id="outline-container-orgdb7a57b" class="outline-2">
<h2 id="orgdb7a57b">What the system can do</h2>
<div class="outline-text-2" id="text-orgdb7a57b">
<ul class="org-ul">
<li>Discovery of other users on the network</li>
<li>Text based chat, one-to-one and in groups</li>
@ -311,12 +311,12 @@ This system should be quite scalable. Both qTox and IPFS are based upon distribu
</div>
</div>
<div id="outline-container-org5cc91dd" class="outline-2">
<h2 id="org5cc91dd">Disk Images</h2>
<div class="outline-text-2" id="text-org5cc91dd">
</div><div id="outline-container-org3f61094" class="outline-3">
<h3 id="org3f61094">Client images</h3>
<div class="outline-text-3" id="text-org3f61094">
<div id="outline-container-orgc804016" class="outline-2">
<h2 id="orgc804016">Disk Images</h2>
<div class="outline-text-2" id="text-orgc804016">
</div><div id="outline-container-orgeb76f79" class="outline-3">
<h3 id="orgeb76f79">Client images</h3>
<div class="outline-text-3" id="text-orgeb76f79">
<div class="org-center">
<div class="figure">
@ -363,16 +363,16 @@ sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-n
</div>
</div>
<div id="outline-container-orge808539" class="outline-3">
<h3 id="orge808539">Router images</h3>
<div class="outline-text-3" id="text-orge808539">
<div id="outline-container-org70774e2" class="outline-3">
<h3 id="org70774e2">Router images</h3>
<div class="outline-text-3" id="text-org70774e2">
<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-org23d456f" class="outline-4">
<h4 id="org23d456f">Beaglebone Black</h4>
<div class="outline-text-4" id="text-org23d456f">
<div id="outline-container-orge9028ca" class="outline-4">
<h4 id="orge9028ca">Beaglebone Black</h4>
<div class="outline-text-4" id="text-orge9028ca">
<div class="org-center">
<div class="figure">
@ -409,9 +409,9 @@ There is still a software freedom issue with the Beaglebone Black, but it doesn'
</div>
</div>
<div id="outline-container-org8badd4f" class="outline-2">
<h2 id="org8badd4f">Building Disk Images</h2>
<div class="outline-text-2" id="text-org8badd4f">
<div id="outline-container-org1af89bc" class="outline-2">
<h2 id="org1af89bc">Building Disk Images</h2>
<div class="outline-text-2" id="text-org1af89bc">
<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>
@ -433,7 +433,6 @@ sha256sum freedombone-mesh-13-09-2016.tar.gz
3e279f8ed762afb682bec6bd463830087354dd2f24020f3b0de51143585ab0ed
tar -xzvf freedombone-mesh-13-09-2016.tar.gz
<span class="org-builtin">cd</span> freedombone
git checkout stockholm
sudo make install
freedombone-image -t i386 -v meshclient
</pre>
@ -501,9 +500,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
</div>
</div>
<div id="outline-container-orgcccda0f" class="outline-2">
<h2 id="orgcccda0f">Customisation</h2>
<div class="outline-text-2" id="text-orgcccda0f">
<div id="outline-container-org5fae536" class="outline-2">
<h2 id="org5fae536">Customisation</h2>
<div class="outline-text-2" id="text-org5fae536">
<p>
If you want to make your own specially branded version, such as for a particular event, then to change the default desktop backgrounds edit the images within <b>img/backgrounds</b> and to change the available avatars and desktop icons edit the images within <b>img/avatars</b>. Re-create disk images using the instructions shown previously.
</p>
@ -513,9 +512,9 @@ If you need particular <i>dconf</i> commands to alter desktop appearance or beha
</p>
</div>
</div>
<div id="outline-container-orgb35f622" class="outline-2">
<h2 id="orgb35f622">How to use it</h2>
<div class="outline-text-2" id="text-orgb35f622">
<div id="outline-container-orgf19b78f" class="outline-2">
<h2 id="orgf19b78f">How to use it</h2>
<div class="outline-text-2" id="text-orgf19b78f">
<p>
When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.
</p>
@ -525,9 +524,9 @@ After a minute or two if you are within wifi range and there is at least one oth
</p>
</div>
<div id="outline-container-org38406d6" class="outline-3">
<h3 id="org38406d6">Set the Date</h3>
<div class="outline-text-3" id="text-org38406d6">
<div id="outline-container-orgb323b0f" class="outline-3">
<h3 id="orgb323b0f">Set the Date</h3>
<div class="outline-text-3" id="text-orgb323b0f">
<p>
On the ordinary internet the date and time of your system would be set automatically via NTP. But this is not the internet and so you will need to manually ensure that your date and time settings are correct. You might need to periodically do this if your clock drifts. It's not essential that the time on your system be highly accurate, but if it drifts too far or goes back to epoch then things could become a little confusing in regard to the order of blog posts.
</p>
@ -537,9 +536,9 @@ On the ordinary internet the date and time of your system would be set automatic
</p>
</div>
</div>
<div id="outline-container-org42a8dc5" class="outline-3">
<h3 id="org42a8dc5">Check network status</h3>
<div class="outline-text-3" id="text-org42a8dc5">
<div id="outline-container-org21297c6" class="outline-3">
<h3 id="org21297c6">Check network status</h3>
<div class="outline-text-3" id="text-org21297c6">
<p>
Unlike with ordinary wifi, on the mesh you don't get a signal strength icon and so it's not simple to see if you have a good connection.
</p>
@ -563,9 +562,9 @@ When you are finished close the window and then select the <i>Network Restart</i
</div>
</div>
<div id="outline-container-org6171f23" class="outline-3">
<h3 id="org6171f23">Chat System</h3>
<div class="outline-text-3" id="text-org6171f23">
<div id="outline-container-orgddd7c4f" class="outline-3">
<h3 id="orgddd7c4f">Chat System</h3>
<div class="outline-text-3" id="text-orgddd7c4f">
<p>
Ensure that you're within wifi range of at least one other mesh peer (could be a router or client) and then you should see that the <i>Chat</i> and <i>Other Users</i> icons appear. Select the users icon and you should see a list of users on the mesh. Select the <i>Chat</i> icon and once you are connected you should see the status light turn green. If after a few minutes you don't get the green status light then try closing and re-opening the Tox chat application. Select the plus button to add a friend and then copy and paste in a Tox ID from the users list.
</p>
@ -624,9 +623,9 @@ At present video doesn't work reliably, but text and voice chat do work well.
</div>
</div>
<div id="outline-container-orgc20605b" class="outline-3">
<h3 id="orgc20605b">Sharing Files</h3>
<div class="outline-text-3" id="text-orgc20605b">
<div id="outline-container-org90d8c9e" class="outline-3">
<h3 id="org90d8c9e">Sharing Files</h3>
<div class="outline-text-3" id="text-org90d8c9e">
<p>
You can make files publicly available on the network simply by dragging and dropping them into the <i>Public</i> folder on the desktop. To view the files belonging to another user select the desktop icon called <i>Visit a site</i> and enter the username or Tox ID of the other user.
</p>
@ -641,9 +640,9 @@ You can make files publicly available on the network simply by dragging and drop
</div>
</div>
<div id="outline-container-orgb5100d8" class="outline-3">
<h3 id="orgb5100d8">Blogging</h3>
<div class="outline-text-3" id="text-orgb5100d8">
<div id="outline-container-org0a98946" class="outline-3">
<h3 id="org0a98946">Blogging</h3>
<div class="outline-text-3" id="text-org0a98946">
<p>
To create a blog post select the <i>Blog</i> icon on the desktop and then use the up and down cursor keys, space bar and enter key to add a new entry. Edit the title of the entry and add your text. You can also include photos if you wish - just copy them to the <b>CreateBlog/content/images</b> directory and then link to them as shown.
</p>