From 2920cbbc714d67967ad6132a8a7564fb7e13aede Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 17 Nov 2018 10:54:07 +0000
Subject: [PATCH] Revert to the earlier way of distributing images
dat is currently too unreliable as a download method
---
doc/EN/armbian.org | 10 --------
website/EN/armbian.html | 16 +------------
website/EN/install_desktop.html | 42 ++++++++++-----------------------
website/EN/install_sbc.html | 36 ++++++++++------------------
4 files changed, 25 insertions(+), 79 deletions(-)
diff --git a/doc/EN/armbian.org b/doc/EN/armbian.org
index 53046d2a3..9707d5acb 100644
--- a/doc/EN/armbian.org
+++ b/doc/EN/armbian.org
@@ -61,16 +61,6 @@ cd freedombone
git checkout stretch
#+end_src
-If you can't obtain a copy of the source code from *code.freedombone.net* (maybe the server is down) then you may still be able to obtain it with:
-
-#+begin_src bash
-dat clone dat://e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e/
-cd e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e
-tar -xzvf freedombone.tar.gz
-cd freedombone
-git checkout stretch
-#+end_src
-
Install the Freedombone commands:
#+begin_src bash
diff --git a/website/EN/armbian.html b/website/EN/armbian.html
index 547578a65..1fa794db8 100644
--- a/website/EN/armbian.html
+++ b/website/EN/armbian.html
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>Freedombone</title>
-<!-- 2018-10-28 Sun 20:35 -->
+<!-- 2018-11-17 Sat 10:53 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="Org-mode" />
<meta name="author" content="Bob Mottram" />
@@ -240,20 +240,6 @@ git checkout stretch
</pre>
</div>
-<p>
-If you can't obtain a copy of the source code from <b>code.freedombone.net</b> (maybe the server is down) then you may still be able to obtain it with:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">dat clone dat://e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e/
-cd e9cbf606e55cdaa85199f4e6ec25ff7456775389979a668b3faf33e057493f8e
-tar -xzvf freedombone.tar.gz
-cd freedombone
-git checkout stretch
-</pre>
-</div>
-
<p>
Install the Freedombone commands:
</p>
diff --git a/website/EN/install_desktop.html b/website/EN/install_desktop.html
index 6113f2b22..7405f1407 100644
--- a/website/EN/install_desktop.html
+++ b/website/EN/install_desktop.html
@@ -114,29 +114,11 @@
<p class="subheadertext">Do this on a separate machine, not the laptop which will become your Freedombone server</p>
- <p class="doctext"><b>1.</b> Install the <a href="install_dat.html">dat command</a></p>
+ <p class="doctext"><b>1.</b> Download <a href="downloads/freedombone-amd64.img.xz">freedombone-amd64.img.xz</a> and extract it. You can use the <b>unxz</b> command to do that.</p>
- <p class="doctext">NOTE: This is <b>not</b> the <a href="https://helpmanual.io/man1/dat">allegro tool</a></p>
+ <p class="doctext">Or there is a <a href="downloads/freedombone-onion-amd64.img.xz">version which only uses onion addresses</a>, which means that you don't need to buy a domain name or set up dynamic DNS.</p>
- <p class="doctext"><b>2.</b> Make sure you have the <a href="install_xz.html">xz command</a> installed</p>
-
- <p class="doctext"><b>3.</b> Download the image</p>
-
- <p class="clitext">
- dat clone dat://b1f714cdd60eb8cbedf9112ce37f8a5e9601fc0d3e1734af8901002adfe0ed74/<br>
- cd b1f714cdd60eb8cbedf9112ce37f8a5e9601fc0d3e1734af8901002adfe0ed74<br>
- unxz freedombone-amd64.img.xz
- </p>
-
- <p class="doctext">Or there is a version which only uses onion addresses, which means that you don't need to buy a domain name or set up dynamic DNS. The onion-only version may be obtained with:</p>
-
- <p class="clitext">
- dat clone dat://86c5ad0c75022c459908348c44604e27c961d19fba8ed0395cbc7928f637185c/<br>
- cd 86c5ad0c75022c459908348c44604e27c961d19fba8ed0395cbc7928f637185c<br>
- unxz freedombone-onion-amd64.img.xz
- </p>
-
- <p class="doctext"><b>4.</b> Plug in a USB drive or connect an SSD which you'll use in the server, then find its device name, which usually begins with <b>/dev/sd</b>. One way of doing this is with the command</p>
+ <p class="doctext"><b>2.</b> Plug in a USB drive or connect an SSD which you'll use in the server, then find its device name, which usually begins with <b>/dev/sd</b>. One way of doing this is with the command</p>
<p class="clitext">
ls /dev/sd*
@@ -144,23 +126,23 @@
<p class="doctext">Before and after attaching the USB or SSD drive</p>
- <p class="doctext"><b>5.</b> Now copy the extracted image to the USB drive or SSD. This may take quite a while</p>
+ <p class="doctext"><b>3.</b> Now copy the extracted image to the USB drive or SSD. This may take quite a while</p>
<p class="clitext">
sudo dd bs=1M if=freedombone-amd64.img of=/dev/sdX conv=fdatasync,sync,noerror
</p>
- <p class="doctext"><b>6.</b> You may want to make sure that you use the whole of the available disk space on the USB drive or SSD, using a tool such as <b>gparted</b> to resize the partition</p>
+ <p class="doctext"><b>4.</b> You may want to make sure that you use the whole of the available disk space on the USB drive or SSD, using a tool such as <b>gparted</b> to resize the partition</p>
- <p class="doctext"><b>7.</b> Remove the USB drive or SSD and plug it into the laptop which will be your server</p>
+ <p class="doctext"><b>5.</b> Remove the USB drive or SSD and plug it into the laptop which will be your server</p>
- <p class="doctext"><b>8.</b> Plug your server laptop into one of the ethernet sockets on your internet router using a USB patch cable (cat5 or cat6). Also make sure that the server laptop has a mains power supply</p>
+ <p class="doctext"><b>6.</b> Plug your server laptop into one of the ethernet sockets on your internet router using a USB patch cable (cat5 or cat6). Also make sure that the server laptop has a mains power supply</p>
- <p class="doctext"><b>9.</b> Power on the laptop and boot from the USB drive or SSD. You may need to change the BIOS settings so that it boots from this drive by default</p>
+ <p class="doctext"><b>7.</b> Power on the laptop and boot from the USB drive or SSD. You may need to change the BIOS settings so that it boots from this drive by default</p>
- <p class="doctext"><b>10.</b> Ensure that <a href="https://en.wikipedia.org/wiki/Zero-configuration_networking">mDNS/zeroconf</a> is enabled on your internet router. The router settings are often accessed via <a href="http://192.168.2.1">192.168.2.1</a> or <a href="http://192.168.10.1">192.168.10.1</a> or <a href="http://192.168.1.254">192.168.1.254</a></p>
+ <p class="doctext"><b>8.</b> Ensure that <a href="https://en.wikipedia.org/wiki/Zero-configuration_networking">mDNS/zeroconf</a> is enabled on your internet router. The router settings are often accessed via <a href="http://192.168.2.1">192.168.2.1</a> or <a href="http://192.168.10.1">192.168.10.1</a> or <a href="http://192.168.1.254">192.168.1.254</a></p>
- <p class="doctext"><b>11.</b> If <i>avahi</i> is not available on your laptop (not the Freedombone server) then make sure you install it</p>
+ <p class="doctext"><b>9.</b> If <i>avahi</i> is not available on your laptop (not the Freedombone server) then make sure you install it</p>
<p class="doctext">On Debian</a>
@@ -175,7 +157,7 @@
sudo sed -i 's|hosts:.*|hosts: files mdns_minimal [NOTFOUND=return] dns myhostname|g' /etc/nsswitch.conf
</p>
- <p class="doctext"><b>12.</b> Browse the local network with</p>
+ <p class="doctext"><b>10.</b> Browse the local network with</p>
<p class="clitext">
avahi-browse -at
@@ -183,7 +165,7 @@
<p class="doctext">If eveything is working you should notice that a system called <i>freedombone</i> appears in the list, with a <i>http</i> service</p>
- <p class="doctext"><b>13.</b> Open a web browser which is <b>not</b> a Tor browser and navigate to <a href="http://freedombone/admin">http://freedombone/admin</a>, or if that doesn't work then try <a href="http://freedombone.local/admin">http://freedombone.local/admin</a>. If your new server isn't named "freedombone" on your local network then log into your internet router and see what local name or local IP address it has been assigned. If all else fails then navigate to <b>[server local IP]/admin</b>.</p>
+ <p class="doctext"><b>11.</b> Open a web browser which is <b>not</b> a Tor browser and navigate to <a href="http://freedombone/admin">http://freedombone/admin</a>, or if that doesn't work then try <a href="http://freedombone.local/admin">http://freedombone.local/admin</a>. If your new server isn't named "freedombone" on your local network then log into your internet router and see what local name or local IP address it has been assigned. If all else fails then navigate to <b>[server local IP]/admin</b>.</p>
<p class="doctext">Congratulations! You are now ready to begin setting up the server and installing apps. You will need to have purchased a <a href="domains.html">domain name</a>, and have a dynamic DNS account or equivalent arrangement so that the server domain name is resolvable from the wider internet.</p>
diff --git a/website/EN/install_sbc.html b/website/EN/install_sbc.html
index e4b5f7a35..4851f60f6 100644
--- a/website/EN/install_sbc.html
+++ b/website/EN/install_sbc.html
@@ -114,23 +114,11 @@
<p class="subheadertext">Do this on a separate machine, not the SBC itself</p>
- <p class="doctext"><b>1.</b> Install the <a href="install_dat.html">dat command</a></p>
+ <p class="doctext"><b>1.</b> Download the <a href="downloads">image for your SBC</a> and extract it. You can use the <b>unxz</b> command to do that. If your SBC is not supported then you may still be able to install Freedombone if it can run Armbian. Details of installing on Armbian can be <a href="armbian.html">found here</a>.</a></p>
- <p class="doctext">NOTE: This is <b>not</b> the <a href="https://helpmanual.io/man1/dat">allegro tool</a></p>
+ <p class="doctext"><b>2.</b> Plug in a microSD card. You might need an external reader device for this, or many laptops have an SDcard slot via which you can connect a microSD card within an adapter.</p>
- <p class="doctext"><b>2.</b> Make sure you have the <a href="install_xz.html">xz command</a> installed</p>
-
- <p class="doctext"><b>3.</b> Download the image for your SBC. The list of available dat files <a href="downloads/images.txt">is here</a>. If your SBC is not supported then you may still be able to install Freedombone if it can run Armbian. Details of installing on Armbian can be <a href="armbian.html">found here</a>.</a></p>
-
- <p class="clitext">
- dat clone dat://...<br>
- cd [cloned directory]<br>
- unxz *.xz
- </p>
-
- <p class="doctext"><b>4.</b> Plug in a microSD card. You might need an external reader device for this, or many laptops have an SDcard slot via which you can connect a microSD card within an adapter.</p>
-
- <p class="doctext"><b>5.</b> Find its device name, which usually begins with <b>/dev/sd</b> or <b>/dev/mmcblk</b>. One way of doing this is with the command</p>
+ <p class="doctext"><b>3.</b> Find its device name, which usually begins with <b>/dev/sd</b> or <b>/dev/mmcblk</b>. One way of doing this is with the command</p>
<p class="clitext">
ls /dev/sd*
@@ -138,7 +126,7 @@
<p class="doctext">Before and after attaching the microSD drive</p>
- <p class="doctext"><b>6.</b> Now copy the extracted image to the microSD drive. This may take quite a while</p>
+ <p class="doctext"><b>4.</b> Now copy the extracted image to the microSD drive. This may take quite a while</p>
<p class="clitext">
sudo dd bs=1M if=freedombone-[your SBC].img of=/dev/sdX conv=fdatasync,sync,noerror
@@ -146,17 +134,17 @@
<p class="doctext">If you're using one of the SATA images then copy the image <i>both to microSD and to the SATA drive</i></p>
- <p class="doctext"><b>7.</b> You may want to make sure that you use the whole of the available space on the microSD drive, using a tool such as <b>gparted</b> to resize the partition</p>
+ <p class="doctext"><b>5.</b> You may want to make sure that you use the whole of the available space on the microSD drive, using a tool such as <b>gparted</b> to resize the partition</p>
- <p class="doctext"><b>8.</b> Remove the microSD drive and plug it into the SBC which will be your server</p>
+ <p class="doctext"><b>6.</b> Remove the microSD drive and plug it into the SBC which will be your server</p>
- <p class="doctext"><b>9.</b> Plug your SBC into one of the ethernet sockets on your internet router using a USB patch cable (cat5 or cat6)</p>
+ <p class="doctext"><b>7.</b> Plug your SBC into one of the ethernet sockets on your internet router using a USB patch cable (cat5 or cat6)</p>
- <p class="doctext"><b>10.</b> Make sure that the SBC has a mains power supply. Connect power to then SBC so that it boots</p>
+ <p class="doctext"><b>8.</b> Make sure that the SBC has a mains power supply. Connect power to then SBC so that it boots</p>
- <p class="doctext"><b>11.</b> Ensure that <a href="https://en.wikipedia.org/wiki/Zero-configuration_networking">mDNS/zeroconf</a> is enabled on your internet router. The router settings are often accessed via <a href="http://192.168.2.1">192.168.2.1</a> or <a href="http://192.168.10.1">192.168.10.1</a> or <a href="http://192.168.1.254">192.168.1.254</a></p>
+ <p class="doctext"><b>9.</b> Ensure that <a href="https://en.wikipedia.org/wiki/Zero-configuration_networking">mDNS/zeroconf</a> is enabled on your internet router. The router settings are often accessed via <a href="http://192.168.2.1">192.168.2.1</a> or <a href="http://192.168.10.1">192.168.10.1</a> or <a href="http://192.168.1.254">192.168.1.254</a></p>
- <p class="doctext"><b>12.</b> If <i>avahi</i> is not available on your laptop (not the Freedombone server) then make sure you install it</p>
+ <p class="doctext"><b>10.</b> If <i>avahi</i> is not available on your laptop (not the Freedombone server) then make sure you install it</p>
<p class="doctext">On Debian</a>
@@ -171,7 +159,7 @@
sudo sed -i 's|hosts:.*|hosts: files mdns_minimal [NOTFOUND=return] dns myhostname|g' /etc/nsswitch.conf
</p>
- <p class="doctext"><b>13.</b> Browse the local network with</p>
+ <p class="doctext"><b>11.</b> Browse the local network with</p>
<p class="clitext">
avahi-browse -at
@@ -179,7 +167,7 @@
<p class="doctext">If eveything is working you should notice that a system called <i>freedombone</i> appears in the list, with a <i>http</i> service</p>
- <p class="doctext"><b>14.</b> Open a web browser which is <b>not</b> a Tor browser and navigate to <a href="http://freedombone/admin">http://freedombone/admin</a>, or if that doesn't work then try <a href="http://freedombone.local/admin">http://freedombone.local/admin</a>. If your new server isn't named "freedombone" on your local network then log into your internet router and see what local name it has been assigned. If all else fails then navigate to <b>[server local IP]/admin</b>.</p>
+ <p class="doctext"><b>12.</b> Open a web browser which is <b>not</b> a Tor browser and navigate to <a href="http://freedombone/admin">http://freedombone/admin</a>, or if that doesn't work then try <a href="http://freedombone.local/admin">http://freedombone.local/admin</a>. If your new server isn't named "freedombone" on your local network then log into your internet router and see what local name it has been assigned. If all else fails then navigate to <b>[server local IP]/admin</b>.</p>
<p class="doctext">Congratulations! You are now ready to begin setting up the server and installing apps. You will need to have purchased a <a href="domains.html">domain name</a>, and have a dynamic DNS account or equivalent arrangement so that the server domain name is resolvable from the wider internet.</p>
--
GitLab