From dc2161b56d7ceba595c9adf9c671530c255eb710 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 5 Dec 2018 11:27:27 +0000
Subject: [PATCH] Remove unused website pages
---
doc/EN/beaglebone.org | 95 --------
doc/EN/homeserver.org | 154 ------------
doc/EN/installmethods.org | 28 ---
doc/EN/release31.org | 4 +-
doc/EN/socialinstance.org | 85 -------
website/EN/beaglebone.html | 323 -------------------------
website/EN/homeserver.html | 426 ---------------------------------
website/EN/installmethods.html | 216 -----------------
website/EN/release31.html | 6 +-
website/EN/socialinstance.html | 327 -------------------------
10 files changed, 5 insertions(+), 1659 deletions(-)
delete mode 100644 doc/EN/beaglebone.org
delete mode 100644 doc/EN/homeserver.org
delete mode 100644 doc/EN/installmethods.org
delete mode 100644 doc/EN/socialinstance.org
delete mode 100644 website/EN/beaglebone.html
delete mode 100644 website/EN/homeserver.html
delete mode 100644 website/EN/installmethods.html
delete mode 100644 website/EN/socialinstance.html
diff --git a/doc/EN/beaglebone.org b/doc/EN/beaglebone.org
deleted file mode 100644
index aa1d31bde..000000000
--- a/doc/EN/beaglebone.org
+++ /dev/null
@@ -1,95 +0,0 @@
-#+TITLE: Freedombone
-#+AUTHOR: Bob Mottram
-#+EMAIL: bob@freedombone.net
-#+KEYWORDS: freedombone, beaglebone
-#+DESCRIPTION: How to install Freedombone onto a Beaglebone Black
-#+OPTIONS: ^:nil toc:nil
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
-
-#+attr_html: :width 80% :height 10% :align center
-[[file:images/logo.png]]
-
-* Installing Freedombone on a Beaglebone Black
-
-The Beaglebone Black is small, cheap, a fully open hardware design, has a hardware random number generator and consumes very little electrical power, making it suitable for all kinds of uses. There is also a wireless version.
-
-You can easily use one to run your own internet services from home.
-
-#+attr_html: :width 50% :align center
-[[file:images/bbb_board.jpg]]
-
-You will need:
-
- * A Beaglebone Black. The exact revision of the hardware isn't very important, but it should have an ethernet socket.
- * Optionally a plastic or metal case to protect the electronics.
- * An ethernet cable. Typically these are colour coded either blue or yellow. Either colour will do. If you're using the Wireless version of the Beaglebone Black then you don't need this.
- * Either a 5v power supply with 5.5mm barrel plug, or a miniUSB type B cable (typically supplied with the Beaglebone) and USB to mains adaptor.
- * A microSD card at least 8 gigabytes in size. In tests Sandisk class 10 works well. Prefer smaller but faster I/O rating to larger but slower.
- * A microSD card adaptor for your laptop or desktop system, so that you can copy the disk image to the card.
-
-You may need to obtain a domain name and set up a dynamic DNS account for your new Freedombone server. Details on how to do that [[./domains.html][can be found here]].
-
-On your laptop or desktop prepare a microSD card image as follows. To create an image on a Debian based system:
-
-#+begin_src bash
-sudo apt-get install git dialog build-essential
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup debian
-#+end_src
-
-Or on Arch/Parabola:
-
-#+begin_src bash
-sudo pacman -S git dialog
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup parabola
-#+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
-
-#+attr_html: :width 80% :align center
-[[file:images/microsd_reader.jpg]]
-
-If you own a domain name and have it linked to a dynamic DNS account (eg. [[https://freedns.afraid.org][freeDNS]]) and want to make a system accessible via an ordinary browser then run:
-
-#+begin_src
-freedombone-image -t beagleboneblack
-#+end_src
-
-Or of you want a system where the services are only accessible via onion addresses.
-
-#+begin_src
-freedombone-image -t beagleboneblack --onion-addresses-only yes
-#+end_src
-
-Onion addresses have the advantage of being difficult to censor and you don't need to buy a domain or have a dynamic DNS account. An onion based system also means you don't need to think about NAT traversal type issues. This *does not* mean that everything gets routed through Tor, it just means that the sites for apps which you install will be available through Tor's address system.
-
-#+attr_html: :width 80% :align center
-[[file:images/bbb_back.jpg]]
-
-Now follow the [[./homeserver.html][instructions given here to copy the image to the microSD drive]] beginning with running the /freedombone-client/ command. Wherever it says "USB drive" substitute "microSD drive". When the microSD drive is ready plug it into the front of the Beaglebone. The photo below also includes an Atheros wifi USB dongle plugged into the front, but that's not necessary unless you want to set up the system to run on a wifi network.
-
-#+attr_html: :width 80% :align center
-[[file:images/bbb_front.jpg]]
-
-Connect the power and for the non-wireless versions of the Beaglebone Black also connect the ethernet cable and plug it into your internet router.
-
-Now power cycle by removing the power plug and then inserting it again. It should boot from the microSD drive and you should see the blue LEDs on the board flashing. If they don't fash at all for a few minutes then try copying the image to the microSD card again.
-
-Follow the rest of the [[./homeserver.html][instructions given here]] to log in via ssh and install the system. The microSD drive /should remain inside the Beaglebone/ and not be removed. This will be its main drive, with the internal EMMC not being used at all. For the Beaglebone Black Wireless ssh back in on the usual 192.168.7.2 address with the USB cable connected so that your wifi login parameters can be set.
-
-There are many apps available within the Freedombone system and trying to install them all is probably not a good idea, since this hardware is very resource constrained on CPU and especially on RAM. If the system seems to be becoming unstable and crashing then the most likely cause is running out of RAM, in which case you can try uninstalling some apps. It is possible to monitor RAM usage by logging in with ssh, exiting to the command line and then running the /top/ command.
diff --git a/doc/EN/homeserver.org b/doc/EN/homeserver.org
deleted file mode 100644
index e9a01ddcc..000000000
--- a/doc/EN/homeserver.org
+++ /dev/null
@@ -1,154 +0,0 @@
-#+TITLE: Freedombone
-#+AUTHOR: Bob Mottram
-#+EMAIL: bob@freedombone.net
-#+KEYWORDS: freedombone, home server
-#+DESCRIPTION: Freedombone home server setup
-#+OPTIONS: ^:nil toc:nil
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
-
-#+attr_html: :width 80% :height 10% :align center
-[[file:images/logo.png]]
-
-
-* Home Server
-
-The quickest way to get started is as follows. You will need to be running a Debian based system (version 8 or later), have an old but still working laptop or netbook which you can use as a server, and 8GB or larger USB thumb drive and an ethernet cable to connect the laptop to your internet router.
-
-First install freedombone onto your local system (not the target hardware that you want to run Freedombone on). On a debian based distro:
-
-#+begin_src bash
-sudo apt-get install git dialog build-essential
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup debian
-freedombone-image -t i386 --onion-addresses-only yes
-#+end_src
-
-Or on Arch/Parabola:
-
-#+begin_src bash
-sudo pacman -S git dialog
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup parabola
-freedombone-image -t i386 --onion-addresses-only yes
-#+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
-
-Now prepare your local system to talk to the freedombone by running the following command. This will set up avahi and create ssh keys if necessary.
-
-#+begin_src bash
-freedombone-client
-#+end_src
-
-#+attr_html: :width 80% :align center
-[[file:images/tor_onion.jpg]]
-
-The version in which sites are available only via onion addresses is the easiest to get started with, since you can evaluate the system without committing to buying an ICANN domain name or needing to get involved with SSL/TLS certificates at all. However, if you do want your sites to be available typically as subdomains of a domain name which you own then remove the *--onion-addresses-only yes* option from the last command shown above. Also see the [[./domains.html][guide on setting up an ICANN domain name]].
-
-The *onion-addresses-only* option *does not* mean that everything gets routed through Tor. It's intended to provide accessible web apps with minimum fuss and without needing to buy a clearnet domain name or mess with forwarding ports. Using apps via their onion addresses may provide some degree of anonymity but it may not be perfect and anonymity isn't the aim of this system (if you want that then use [[https://tails.boum.org/][TAILS]]).
-
-If you want to create images for microSD cards used within various single board computers then replace the *i386* with *beagleboneblack* / *cubieboard2* / *cubietruck* / *a20-olinuxino-lime* / *a20-olinuxino-lime2* / *a20-olinuxino-micro* or *apu*.
-
-#+attr_html: :width 80% :align center
-[[file:images/beaglebone_black9.jpg]]
-
-This takes a while. Maybe an hour or so, depending on the speed of your system and the internets. The good news though is that once created you can use the resulting image any number of times, and you don't need to trust some pre-built image.
-
-List what drives are on your system with:
-
-#+begin_src bash
-ls /dev/sd*
-#+end_src
-
-Now plug in the USB thumb drive, and do the same again. Notice which drive letter gets added.
-
-You can now copy the image to the USB thumb drive, replacing *sdX* with the identifier of the USB thumb drive. Don't include any numbers (so for example use *sdc* instead of *sdc1*).
-
-#+begin_src bash
-dd if=/dev/zero of=/dev/sdX bs=32M count=8
-dd bs=32M if=myimagefile.img of=/dev/sdX conv=fdatasync,sync,noerror
-#+end_src
-
-And wait. Again it will take a while to copy over. When that's done plug it into the laptop or netbook which you want to use as a server, power on and set the BIOS to boot from the USB stick.
-
-As the system boots for the first time the login is:
-
-#+begin_src bash
-username: fbone
-password: freedombone
-#+end_src
-
-If you're installing from a microSD card on a single board computer without a screen and keyboard attached then you can ssh into it with:
-
-#+begin_src bash
-ssh fbone@freedombone.local -p 2222
-#+end_src
-
-Using the initial password "/freedombone/".
-
-You will then be shown a new randomly generated password. It's *very important* that you write this down somewhere before going further, because you'll need this to log in later.
-
-You'll be asked to set a username and a "real" name (or nickname), then the rest of the installation will be automatic. Again, it takes a while, so go and do something less boring instead. At the end of the base install you can also choose to install specific apps, but if you want to do that later then just press Enter.
-
-When it's installed on your local system open a terminal and verify the ssh server key hash with:
-
-#+begin_src bash
-freedombone-client --verify
-#+end_src
-
-This will show the hash code for the public ssh key of the Freedombone system.
-
-#+attr_html: :width 80% :align center
-[[file:images/ssh_key_verify.jpg]]
-
-Open another terminal window then run:
-
-#+begin_src bash
-freedombone-client
-ssh myusername@freedombone.local -p 2222
-#+end_src
-
-Use the password you wrote down earlier to log in. Select the *administrator control panel* with up and down cursor keys and enter key. You should see something like this, and you might need to re-enter your password.
-
-#+attr_html: :width 80% :align center
-[[file:images/controlpanel/control_panel.jpg]]
-
-Then select *About*. You'll see a list of sites and their onion addresses.
-
-#+attr_html: :width 100% :align center
-[[file:images/controlpanel/control_panel_about.jpg]]
-
-The About screen contains the ssh server public key hashes and you can compare the relevant one with the previous terminal window to verify that they're the same. If they're not then you might have a /machine-in-the-middle/ snooping on you.
-
-You have now confirmed a secure connection. Probably. If you're still sceptical then you can power off the system, remove the microSD card and manually check the public keys within the /etc/ssh directory on the drive.
-
-Press any key to exit from the About screen. You can then select *Add/Remove apps* and add whatever applications you wish to run. Note that some apps will only run on x86 systems, but most will install and run on ARM single board computers. More details on particular apps can be [[./apps.html][found here]].
-
-#+attr_html: :width 80% :align center
-[[file:images/controlpanel/control_panel_apps.jpg]]
-
-Once your apps have installed you can go back to the About screen, pick an onion address and try it within a Tor compatible browser. You'll need to know the login passwords and those can be found within the /Passwords/ section of the administrator control panel. An axiom of the Freedombone system is that /if given the choice users will usually use insecure passwords/, so on this system passwords are generated randomly. If you need to then you can transfer the passwords into your favourite password manager and remove them from the server by going to the *Security Settings* section of the administrator control panel and choosing *Export passwords* and *Password storage*.
-
-*Congratulations! You have now become a citizen of the free internet.*
-
-*Use your new powers wisely.*
-
-Of course, this is just one way in which you can install the Freedombone system. If you have a single board computer (SBC) such as a [[./beaglebone.html][BeagleBone Black]] or OLinuxino you can make disk images for those too. You can even create clearnet sites if you have your own domain name. ARM boards with closed proprietary boot blobs are not supported. For more details run:
-
-#+begin_src bash
-man freedombone-image
-#+end_src
diff --git a/doc/EN/installmethods.org b/doc/EN/installmethods.org
deleted file mode 100644
index 8b23ad786..000000000
--- a/doc/EN/installmethods.org
+++ /dev/null
@@ -1,28 +0,0 @@
-#+TITLE: Freedombone
-#+AUTHOR: Bob Mottram
-#+EMAIL: bob@freedombone.net
-#+KEYWORDS: freedombone, installation
-#+DESCRIPTION: Installation methods
-#+OPTIONS: ^:nil toc:nil
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
-
-#+attr_html: :width 80% :height 10% :align center
-[[file:images/logo.png]]
-
-Most people don't have a static external IP address, so you will need to have an account on a dymanic DNS service. [[https://freedns.afraid.org][FreeDNS]] is the one recommended, but others are available.
-
-If you want systems to be available within an ordinary web browser, such as Firefox, then you will need to [[./domains.html][obtain a domain name]].
-
-A list of other supported ARM boards [[./boards.html][can be found here]], or you can install onto an old laptop or netbook. Some installation instructions for different use cases are:
-
- * [[./homeserver.html][Typical installation]]
- * Installing [[./beaglebone.html][on a Beaglebone Black]]
- * Installing on an [[./debianinstall.html][existing Debian system]]
- * Installing [[./armbian.html][on Armbian]], for unsupported ARM boards such as Raspberry Pi
- * Creating a dedicated [[./socialinstance.html][fediverse instance]] for a single user or to host a community
- * Deploying a [[./mesh.html][mesh network]] which can operate with or without the internet
- * [[./users.html][Adding or removing users]]
- * [[./security.html][Improving security]]
- * [[./mobile.html][Advice on setting up a mobile phone]]
- * [[./apps.html][Apps available on the system]]
- * [[./faq.html][Frequently Asked Questions]]
diff --git a/doc/EN/release31.org b/doc/EN/release31.org
index 21cdeb2ba..cfede993c 100644
--- a/doc/EN/release31.org
+++ b/doc/EN/release31.org
@@ -23,7 +23,7 @@ Newer and shinier than before, [[./index.html][Freedombone]] 3.1 rests upon the
The [[./mesh.html][mesh version]] now supports BMX6, OLSR2 and Babel routing protocols on layer 3 and so is protocol compatible with [[https://libremesh.org][LibreMesh]]. It also now runs on pure IPv6 and has built in video editor and CryptPad integration for networked collaboration even during times when the internet is not available.
-There is a new [[./socialinstance.html][social instance]] image build option, if you want to be able to rapidly deploy fediverse instances, and a [[./devguide.html][template command]] for quickly adding new apps to the system which automates a lot of the boilerplate.
+There is a new social instance image build option, if you want to be able to rapidly deploy fediverse instances, and a [[./devguide.html][template command]] for quickly adding new apps to the system which automates a lot of the boilerplate.
According to some narratives the open web is dying with the silo companies comprising 80% of web traffic and what remains being pushed into an increasingly marginal corner. But at the same time these colonial occupiers have come under renewed [[https://www.wired.co.uk/article/open-letter-mark-zuckerberg-congress][public criticism]] as they continue to abuse their monopoly powers in ever more egregious ways. 2017 seemed to be a turning point in attitudes towards Silicon Valley generally and there is room for a new kind of movement to get started which is about reclaiming the internet for the common good.
@@ -63,7 +63,7 @@ Using the initial password "freedombone". If you have trouble accessing the serv
You will then be shown a new randomly generated password. It's very important that you write this down somewhere or transfer it to a password manager before going further, because you'll need this to log in later.
-More detailed installation instructions are linked from [[./installmethods.html][the main site]].
+More detailed installation instructions are linked from the main site.
* Upgrading from a previous install
diff --git a/doc/EN/socialinstance.org b/doc/EN/socialinstance.org
deleted file mode 100644
index 40a1b533a..000000000
--- a/doc/EN/socialinstance.org
+++ /dev/null
@@ -1,85 +0,0 @@
-#+TITLE: Freedombone
-#+AUTHOR: Bob Mottram
-#+EMAIL: bob@freedombone.net
-#+KEYWORDS: freedombone, debian, social, fediverse, instance, pleroma, gnusocial, postactiv
-#+DESCRIPTION: Social Instance
-#+OPTIONS: ^:nil toc:nil
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="freedombone.css" />
-
-#+attr_html: :width 80% :height 10% :align center
-[[file:images/logo.png]]
-
-* Social Instance
-
-A social instance image allows you to easily set up a fediverse server, which federates using the OStatus or ActivityPub protocol. You will need:
-
- * An old laptop, capable of booting from USB
- * A USB drive, preferably Sandisk and 16GB or larger
- * An ethernet patch cable
- * A domain name of your own
- * A dynamic DNS account
- * Ability to alter settings on your internet router
-
-The installation process is the same as usual, with the only difference being that on initial setup it will go straight to the domain setup details for your instance. In summary:
-
-* Copy the image to the USB drive
-
-Substitute *sdX* with the device name for your USB drive.
-
-#+begin_src bash
-sudo apt-get install xz-utils nodejs
-npm install -g dat
-dat clone dat://231b24dbeef3c3f7b115b9c7cd02e416b382df0a1050ef66f94b988fc8dae92e/
-cd 231b24dbeef3c3f7b115b9c7cd02e416b382df0a1050ef66f94b988fc8dae92e
-gpg --verify freedombone-pleroma-amd64.img.xz.sig
-unxz freedombone-pleroma-amd64.img.xz
-sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8
-sudo dd bs=32M if=freedombone-pleroma-amd64.img of=/dev/sdX conv=fdatasync,sync,noerror
-#+end_src
-
-Also note that if the laptop has a removable SSD drive it's possible to copy the image directly to that if you have enough equipment.
-
-* Connect the laptop to your internet router
-
-Plug the USB drive into the laptop and connect it to your internet router with the ethernet cable.
-
-#+attr_html: :width 100% :align center
-[[file:images/laptop_router.jpg]]
-
-* Boot the laptop from the USB drive
-
-You may need to alter the BIOS settings to get this to work reliably.
-
-#+attr_html: :width 100% :align center
-[[file:images/bios_boot_usb.jpg]]
-
-* Forward ports 80 (HTTP) and 443 (HTTPS) from your internet router to the laptop
-
-Log into your internet router using a non-Tor browser (usually it's on an address like 192.168.1.1 or 192.168.1.254). Often port forwarding settings are together with firewall settings.
-
-#+attr_html: :width 100% :align center
-[[file:images/port_forwarding.png]]
-
-* From another machine ssh into the laptop
-
-#+begin_src bash
-ssh fbone@freedombone.local -p 2222
-#+END_SRC
-
-Or alternatively you can log in directly on the laptop. The initial username is *fbone* and the password is *freedombone*. You should make sure you write down or copy the new password when it is shown.
-
-* Follow the setup procedure
-
-Enter your user details, domain name and dynamic DNS settings.
-
-* When installation is complete
-
-Navigate to your domain and register a new user.
-
-#+attr_html: :width 100% :align center
-[[file:images/pleroma_register.jpg]]
-
-More details about setting up and using Pleroma [[./app_pleroma.html][can be found here]].
-
-#+attr_html: :width 50% :align center
-[[file:images/tusky.jpg]]
diff --git a/website/EN/beaglebone.html b/website/EN/beaglebone.html
deleted file mode 100644
index 338969f8b..000000000
--- a/website/EN/beaglebone.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<title>Freedombone</title>
-<!-- 2018-07-17 Tue 10:34 -->
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="generator" content="Org-mode" />
-<meta name="author" content="Bob Mottram" />
-<meta name="description" content="How to install Freedombone onto a Beaglebone Black"
- />
-<meta name="keywords" content="freedombone, beaglebone" />
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
- .title { text-align: center; }
- .todo { font-family: monospace; color: red; }
- .done { color: green; }
- .tag { background-color: #eee; font-family: monospace;
- padding: 2px; font-size: 80%; font-weight: normal; }
- .timestamp { color: #bebebe; }
- .timestamp-kwd { color: #5f9ea0; }
- .right { margin-left: auto; margin-right: 0px; text-align: right; }
- .left { margin-left: 0px; margin-right: auto; text-align: left; }
- .center { margin-left: auto; margin-right: auto; text-align: center; }
- .underline { text-decoration: underline; }
- #postamble p, #preamble p { font-size: 90%; margin: .2em; }
- p.verse { margin-left: 3%; }
- pre {
- border: 1px solid #ccc;
- box-shadow: 3px 3px 3px #eee;
- padding: 8pt;
- font-family: monospace;
- overflow: auto;
- margin: 1.2em;
- }
- pre.src {
- position: relative;
- overflow: visible;
- padding-top: 1.2em;
- }
- pre.src:before {
- display: none;
- position: absolute;
- background-color: white;
- top: -10px;
- right: 10px;
- padding: 3px;
- border: 1px solid black;
- }
- pre.src:hover:before { display: inline;}
- pre.src-sh:before { content: 'sh'; }
- pre.src-bash:before { content: 'sh'; }
- pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
- pre.src-R:before { content: 'R'; }
- pre.src-perl:before { content: 'Perl'; }
- pre.src-java:before { content: 'Java'; }
- pre.src-sql:before { content: 'SQL'; }
-
- table { border-collapse:collapse; }
- caption.t-above { caption-side: top; }
- caption.t-bottom { caption-side: bottom; }
- td, th { vertical-align:top; }
- th.right { text-align: center; }
- th.left { text-align: center; }
- th.center { text-align: center; }
- td.right { text-align: right; }
- td.left { text-align: left; }
- td.center { text-align: center; }
- dt { font-weight: bold; }
- .footpara:nth-child(2) { display: inline; }
- .footpara { display: block; }
- .footdef { margin-bottom: 1em; }
- .figure { padding: 1em; }
- .figure p { text-align: center; }
- .inlinetask {
- padding: 10px;
- border: 2px solid gray;
- margin: 10px;
- background: #ffffcc;
- }
- #org-div-home-and-up
- { text-align: right; font-size: 70%; white-space: nowrap; }
- textarea { overflow-x: auto; }
- .linenr { font-size: smaller }
- .code-highlighted { background-color: #ffff00; }
- .org-info-js_info-navigation { border-style: none; }
- #org-info-js_console-label
- { font-size: 10px; font-weight: bold; white-space: nowrap; }
- .org-info-js_search-highlight
- { background-color: #ffff00; color: #000000; font-weight: bold; }
- /*]]>*/-->
-</style>
-<link rel="stylesheet" type="text/css" href="freedombone.css" />
-<script type="text/javascript">
-/*
-@licstart The following is the entire license notice for the
-JavaScript code in this tag.
-
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-The JavaScript code in this tag is free software: you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License (GNU GPL) as published by the Free Software
-Foundation, either version 3 of the License, or (at your option)
-any later version. The code is distributed WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
-
-As additional permission under GNU GPL version 3 section 7, you
-may distribute non-source (e.g., minimized or compacted) forms of
-that code without the copy of the GNU GPL normally required by
-section 4, provided you include this license notice and a URL
-through which recipients can access the Corresponding Source.
-
-
-@licend The above is the entire license notice
-for the JavaScript code in this tag.
-*/
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
- var target = document.getElementById(id);
- if(null != target) {
- elem.cacheClassElem = elem.className;
- elem.cacheClassTarget = target.className;
- target.className = "code-highlighted";
- elem.className = "code-highlighted";
- }
- }
- function CodeHighlightOff(elem, id)
- {
- var target = document.getElementById(id);
- if(elem.cacheClassElem)
- elem.className = elem.cacheClassElem;
- if(elem.cacheClassTarget)
- target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-</head>
-<body>
-<div id="preamble" class="status">
-<a name="top" id="top"></a>
-</div>
-<div id="content">
-<h1 class="title">Freedombone</h1>
-
-<div class="figure">
-<p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
-</p>
-</div>
-
-<div id="outline-container-sec-1" class="outline-2">
-<h2 id="sec-1">Installing Freedombone on a Beaglebone Black</h2>
-<div class="outline-text-2" id="text-1">
-<p>
-The Beaglebone Black is small, cheap, a fully open hardware design, has a hardware random number generator and consumes very little electrical power, making it suitable for all kinds of uses. There is also a wireless version.
-</p>
-
-<p>
-You can easily use one to run your own internet services from home.
-</p>
-
-
-<div class="figure">
-<p><img src="images/bbb_board.jpg" alt="bbb_board.jpg" width="50%" align="center" />
-</p>
-</div>
-
-<p>
-You will need:
-</p>
-
-<ul class="org-ul">
-<li>A Beaglebone Black. The exact revision of the hardware isn't very important, but it should have an ethernet socket.
-</li>
-<li>Optionally a plastic or metal case to protect the electronics.
-</li>
-<li>An ethernet cable. Typically these are colour coded either blue or yellow. Either colour will do. If you're using the Wireless version of the Beaglebone Black then you don't need this.
-</li>
-<li>Either a 5v power supply with 5.5mm barrel plug, or a miniUSB type B cable (typically supplied with the Beaglebone) and USB to mains adaptor.
-</li>
-<li>A microSD card at least 8 gigabytes in size. In tests Sandisk class 10 works well. Prefer smaller but faster I/O rating to larger but slower.
-</li>
-<li>A microSD card adaptor for your laptop or desktop system, so that you can copy the disk image to the card.
-</li>
-</ul>
-
-<p>
-You may need to obtain a domain name and set up a dynamic DNS account for your new Freedombone server. Details on how to do that <a href="./domains.html">can be found here</a>.
-</p>
-
-<p>
-On your laptop or desktop prepare a microSD card image as follows. To create an image on a Debian based system:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">sudo apt-get install git dialog build-essential
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup debian
-</pre>
-</div>
-
-<p>
-Or on Arch/Parabola:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">sudo pacman -S git dialog
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup parabola
-</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>
-
-
-<div class="figure">
-<p><img src="images/microsd_reader.jpg" alt="microsd_reader.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-If you own a domain name and have it linked to a dynamic DNS account (eg. <a href="https://freedns.afraid.org">freeDNS</a>) and want to make a system accessible via an ordinary browser then run:
-</p>
-
-<pre class="example">
-freedombone-image -t beagleboneblack
-</pre>
-
-<p>
-Or of you want a system where the services are only accessible via onion addresses.
-</p>
-
-<pre class="example">
-freedombone-image -t beagleboneblack --onion-addresses-only yes
-</pre>
-
-<p>
-Onion addresses have the advantage of being difficult to censor and you don't need to buy a domain or have a dynamic DNS account. An onion based system also means you don't need to think about NAT traversal type issues. This <b>does not</b> mean that everything gets routed through Tor, it just means that the sites for apps which you install will be available through Tor's address system.
-</p>
-
-
-<div class="figure">
-<p><img src="images/bbb_back.jpg" alt="bbb_back.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-Now follow the <a href="./homeserver.html">instructions given here to copy the image to the microSD drive</a> beginning with running the <i>freedombone-client</i> command. Wherever it says "USB drive" substitute "microSD drive". When the microSD drive is ready plug it into the front of the Beaglebone. The photo below also includes an Atheros wifi USB dongle plugged into the front, but that's not necessary unless you want to set up the system to run on a wifi network.
-</p>
-
-
-<div class="figure">
-<p><img src="images/bbb_front.jpg" alt="bbb_front.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-Connect the power and for the non-wireless versions of the Beaglebone Black also connect the ethernet cable and plug it into your internet router.
-</p>
-
-<p>
-Now power cycle by removing the power plug and then inserting it again. It should boot from the microSD drive and you should see the blue LEDs on the board flashing. If they don't fash at all for a few minutes then try copying the image to the microSD card again.
-</p>
-
-<p>
-Follow the rest of the <a href="./homeserver.html">instructions given here</a> to log in via ssh and install the system. The microSD drive <i>should remain inside the Beaglebone</i> and not be removed. This will be its main drive, with the internal EMMC not being used at all. For the Beaglebone Black Wireless ssh back in on the usual 192.168.7.2 address with the USB cable connected so that your wifi login parameters can be set.
-</p>
-
-<p>
-There are many apps available within the Freedombone system and trying to install them all is probably not a good idea, since this hardware is very resource constrained on CPU and especially on RAM. If the system seems to be becoming unstable and crashing then the most likely cause is running out of RAM, in which case you can try uninstalling some apps. It is possible to monitor RAM usage by logging in with ssh, exiting to the command line and then running the <i>top</i> command.
-</p>
-</div>
-</div>
-</div>
-<div id="postamble" class="status">
-
-<style type="text/css">
-.back-to-top {
- position: fixed;
- bottom: 2em;
- right: 0px;
- text-decoration: none;
- color: #000000;
- background-color: rgba(235, 235, 235, 0.80);
- font-size: 12px;
- padding: 1em;
- display: none;
-}
-
-.back-to-top:hover {
- background-color: rgba(135, 135, 135, 0.50);
-}
-</style>
-
-<div class="back-to-top">
-<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/EN/homeserver.html b/website/EN/homeserver.html
deleted file mode 100644
index 0c6e0ce49..000000000
--- a/website/EN/homeserver.html
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<title>Freedombone</title>
-<!-- 2018-11-19 Mon 11:11 -->
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="generator" content="Org-mode" />
-<meta name="author" content="Bob Mottram" />
-<meta name="description" content="Freedombone home server setup"
- />
-<meta name="keywords" content="freedombone, home server" />
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
- .title { text-align: center; }
- .todo { font-family: monospace; color: red; }
- .done { color: green; }
- .tag { background-color: #eee; font-family: monospace;
- padding: 2px; font-size: 80%; font-weight: normal; }
- .timestamp { color: #bebebe; }
- .timestamp-kwd { color: #5f9ea0; }
- .right { margin-left: auto; margin-right: 0px; text-align: right; }
- .left { margin-left: 0px; margin-right: auto; text-align: left; }
- .center { margin-left: auto; margin-right: auto; text-align: center; }
- .underline { text-decoration: underline; }
- #postamble p, #preamble p { font-size: 90%; margin: .2em; }
- p.verse { margin-left: 3%; }
- pre {
- border: 1px solid #ccc;
- box-shadow: 3px 3px 3px #eee;
- padding: 8pt;
- font-family: monospace;
- overflow: auto;
- margin: 1.2em;
- }
- pre.src {
- position: relative;
- overflow: visible;
- padding-top: 1.2em;
- }
- pre.src:before {
- display: none;
- position: absolute;
- background-color: white;
- top: -10px;
- right: 10px;
- padding: 3px;
- border: 1px solid black;
- }
- pre.src:hover:before { display: inline;}
- pre.src-sh:before { content: 'sh'; }
- pre.src-bash:before { content: 'sh'; }
- pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
- pre.src-R:before { content: 'R'; }
- pre.src-perl:before { content: 'Perl'; }
- pre.src-java:before { content: 'Java'; }
- pre.src-sql:before { content: 'SQL'; }
-
- table { border-collapse:collapse; }
- caption.t-above { caption-side: top; }
- caption.t-bottom { caption-side: bottom; }
- td, th { vertical-align:top; }
- th.right { text-align: center; }
- th.left { text-align: center; }
- th.center { text-align: center; }
- td.right { text-align: right; }
- td.left { text-align: left; }
- td.center { text-align: center; }
- dt { font-weight: bold; }
- .footpara:nth-child(2) { display: inline; }
- .footpara { display: block; }
- .footdef { margin-bottom: 1em; }
- .figure { padding: 1em; }
- .figure p { text-align: center; }
- .inlinetask {
- padding: 10px;
- border: 2px solid gray;
- margin: 10px;
- background: #ffffcc;
- }
- #org-div-home-and-up
- { text-align: right; font-size: 70%; white-space: nowrap; }
- textarea { overflow-x: auto; }
- .linenr { font-size: smaller }
- .code-highlighted { background-color: #ffff00; }
- .org-info-js_info-navigation { border-style: none; }
- #org-info-js_console-label
- { font-size: 10px; font-weight: bold; white-space: nowrap; }
- .org-info-js_search-highlight
- { background-color: #ffff00; color: #000000; font-weight: bold; }
- /*]]>*/-->
-</style>
-<link rel="stylesheet" type="text/css" href="freedombone.css" />
-<script type="text/javascript">
-/*
-@licstart The following is the entire license notice for the
-JavaScript code in this tag.
-
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-The JavaScript code in this tag is free software: you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License (GNU GPL) as published by the Free Software
-Foundation, either version 3 of the License, or (at your option)
-any later version. The code is distributed WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
-
-As additional permission under GNU GPL version 3 section 7, you
-may distribute non-source (e.g., minimized or compacted) forms of
-that code without the copy of the GNU GPL normally required by
-section 4, provided you include this license notice and a URL
-through which recipients can access the Corresponding Source.
-
-
-@licend The above is the entire license notice
-for the JavaScript code in this tag.
-*/
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
- var target = document.getElementById(id);
- if(null != target) {
- elem.cacheClassElem = elem.className;
- elem.cacheClassTarget = target.className;
- target.className = "code-highlighted";
- elem.className = "code-highlighted";
- }
- }
- function CodeHighlightOff(elem, id)
- {
- var target = document.getElementById(id);
- if(elem.cacheClassElem)
- elem.className = elem.cacheClassElem;
- if(elem.cacheClassTarget)
- target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-</head>
-<body>
-<div id="preamble" class="status">
-<a name="top" id="top"></a>
-</div>
-<div id="content">
-<h1 class="title">Freedombone</h1>
-
-<div class="figure">
-<p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
-</p>
-</div>
-
-
-<div id="outline-container-sec-1" class="outline-2">
-<h2 id="sec-1">Home Server</h2>
-<div class="outline-text-2" id="text-1">
-<p>
-The quickest way to get started is as follows. You will need to be running a Debian based system (version 8 or later), have an old but still working laptop or netbook which you can use as a server, and 8GB or larger USB thumb drive and an ethernet cable to connect the laptop to your internet router.
-</p>
-
-<p>
-First install freedombone onto your local system (not the target hardware that you want to run Freedombone on). On a debian based distro:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">sudo apt-get install git dialog build-essential
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup debian
-freedombone-image -t i386 --onion-addresses-only yes
-</pre>
-</div>
-
-<p>
-Or on Arch/Parabola:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">sudo pacman -S git dialog
-git clone https://code.freedombone.net/bashrc/freedombone
-cd freedombone
-git checkout stretch
-sudo make install
-freedombone-image --setup parabola
-freedombone-image -t i386 --onion-addresses-only yes
-</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>
-Now prepare your local system to talk to the freedombone by running the following command. This will set up avahi and create ssh keys if necessary.
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">freedombone-client
-</pre>
-</div>
-
-
-<div class="figure">
-<p><img src="images/tor_onion.jpg" alt="tor_onion.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-The version in which sites are available only via onion addresses is the easiest to get started with, since you can evaluate the system without committing to buying an ICANN domain name or needing to get involved with SSL/TLS certificates at all. However, if you do want your sites to be available typically as subdomains of a domain name which you own then remove the <b>–onion-addresses-only yes</b> option from the last command shown above. Also see the <a href="./domains.html">guide on setting up an ICANN domain name</a>.
-</p>
-
-<p>
-The <b>onion-addresses-only</b> option <b>does not</b> mean that everything gets routed through Tor. It's intended to provide accessible web apps with minimum fuss and without needing to buy a clearnet domain name or mess with forwarding ports. Using apps via their onion addresses may provide some degree of anonymity but it may not be perfect and anonymity isn't the aim of this system (if you want that then use <a href="https://tails.boum.org/">TAILS</a>).
-</p>
-
-<p>
-If you want to create images for microSD cards used within various single board computers then replace the <b>i386</b> with <b>beagleboneblack</b> / <b>cubieboard2</b> / <b>cubietruck</b> / <b>a20-olinuxino-lime</b> / <b>a20-olinuxino-lime2</b> / <b>a20-olinuxino-micro</b> or <b>apu</b>.
-</p>
-
-
-<div class="figure">
-<p><img src="images/beaglebone_black9.jpg" alt="beaglebone_black9.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-This takes a while. Maybe an hour or so, depending on the speed of your system and the internets. The good news though is that once created you can use the resulting image any number of times, and you don't need to trust some pre-built image.
-</p>
-
-<p>
-List what drives are on your system with:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">ls /dev/sd*
-</pre>
-</div>
-
-<p>
-Now plug in the USB thumb drive, and do the same again. Notice which drive letter gets added.
-</p>
-
-<p>
-You can now copy the image to the USB thumb drive, replacing <b>sdX</b> with the identifier of the USB thumb drive. Don't include any numbers (so for example use <b>sdc</b> instead of <b>sdc1</b>).
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">dd if=/dev/zero of=/dev/sdX bs=32M count=8
-dd bs=32M if=myimagefile.img of=/dev/sdX conv=fdatasync,sync,noerror
-</pre>
-</div>
-
-<p>
-And wait. Again it will take a while to copy over. When that's done plug it into the laptop or netbook which you want to use as a server, power on and set the BIOS to boot from the USB stick.
-</p>
-
-<p>
-As the system boots for the first time the login is:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">username: fbone
-password: freedombone
-</pre>
-</div>
-
-<p>
-If you're installing from a microSD card on a single board computer without a screen and keyboard attached then you can ssh into it with:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">ssh fbone@freedombone.local -p 2222
-</pre>
-</div>
-
-<p>
-Using the initial password "<i>freedombone</i>".
-</p>
-
-<p>
-You will then be shown a new randomly generated password. It's <b>very important</b> that you write this down somewhere before going further, because you'll need this to log in later.
-</p>
-
-<p>
-You'll be asked to set a username and a "real" name (or nickname), then the rest of the installation will be automatic. Again, it takes a while, so go and do something less boring instead. At the end of the base install you can also choose to install specific apps, but if you want to do that later then just press Enter.
-</p>
-
-<p>
-When it's installed on your local system open a terminal and verify the ssh server key hash with:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">freedombone-client --verify
-</pre>
-</div>
-
-<p>
-This will show the hash code for the public ssh key of the Freedombone system.
-</p>
-
-
-<div class="figure">
-<p><img src="images/ssh_key_verify.jpg" alt="ssh_key_verify.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-Open another terminal window then run:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">freedombone-client
-ssh myusername@freedombone.local -p 2222
-</pre>
-</div>
-
-<p>
-Use the password you wrote down earlier to log in. Select the <b>administrator control panel</b> with up and down cursor keys and enter key. You should see something like this, and you might need to re-enter your password.
-</p>
-
-
-<div class="figure">
-<p><img src="images/controlpanel/control_panel.jpg" alt="control_panel.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-Then select <b>About</b>. You'll see a list of sites and their onion addresses.
-</p>
-
-
-<div class="figure">
-<p><img src="images/controlpanel/control_panel_about.jpg" alt="control_panel_about.jpg" width="100%" align="center" />
-</p>
-</div>
-
-<p>
-The About screen contains the ssh server public key hashes and you can compare the relevant one with the previous terminal window to verify that they're the same. If they're not then you might have a <i>machine-in-the-middle</i> snooping on you.
-</p>
-
-<p>
-You have now confirmed a secure connection. Probably. If you're still sceptical then you can power off the system, remove the microSD card and manually check the public keys within the /etc/ssh directory on the drive.
-</p>
-
-<p>
-Press any key to exit from the About screen. You can then select <b>Add/Remove apps</b> and add whatever applications you wish to run. Note that some apps will only run on x86 systems, but most will install and run on ARM single board computers. More details on particular apps can be <a href="./apps.html">found here</a>.
-</p>
-
-
-<div class="figure">
-<p><img src="images/controlpanel/control_panel_apps.jpg" alt="control_panel_apps.jpg" width="80%" align="center" />
-</p>
-</div>
-
-<p>
-Once your apps have installed you can go back to the About screen, pick an onion address and try it within a Tor compatible browser. You'll need to know the login passwords and those can be found within the <i>Passwords</i> section of the administrator control panel. An axiom of the Freedombone system is that <i>if given the choice users will usually use insecure passwords</i>, so on this system passwords are generated randomly. If you need to then you can transfer the passwords into your favourite password manager and remove them from the server by going to the <b>Security Settings</b> section of the administrator control panel and choosing <b>Export passwords</b> and <b>Password storage</b>.
-</p>
-
-<p>
-<b>Congratulations! You have now become a citizen of the free internet.</b>
-</p>
-
-<p>
-<b>Use your new powers wisely.</b>
-</p>
-
-<p>
-Of course, this is just one way in which you can install the Freedombone system. If you have a single board computer (SBC) such as a <a href="./beaglebone.html">BeagleBone Black</a> or OLinuxino you can make disk images for those too. You can even create clearnet sites if you have your own domain name. ARM boards with closed proprietary boot blobs are not supported. For more details run:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">man freedombone-image
-</pre>
-</div>
-</div>
-</div>
-</div>
-<div id="postamble" class="status">
-
-<style type="text/css">
-.back-to-top {
- position: fixed;
- bottom: 2em;
- right: 0px;
- text-decoration: none;
- color: #000000;
- background-color: rgba(235, 235, 235, 0.80);
- font-size: 12px;
- padding: 1em;
- display: none;
-}
-
-.back-to-top:hover {
- background-color: rgba(135, 135, 135, 0.50);
-}
-</style>
-
-<div class="back-to-top">
-<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/EN/installmethods.html b/website/EN/installmethods.html
deleted file mode 100644
index d97858ea2..000000000
--- a/website/EN/installmethods.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<title>Freedombone</title>
-<!-- 2018-11-19 Mon 11:11 -->
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="generator" content="Org-mode" />
-<meta name="author" content="Bob Mottram" />
-<meta name="description" content="Installation methods"
- />
-<meta name="keywords" content="freedombone, installation" />
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
- .title { text-align: center; }
- .todo { font-family: monospace; color: red; }
- .done { color: green; }
- .tag { background-color: #eee; font-family: monospace;
- padding: 2px; font-size: 80%; font-weight: normal; }
- .timestamp { color: #bebebe; }
- .timestamp-kwd { color: #5f9ea0; }
- .right { margin-left: auto; margin-right: 0px; text-align: right; }
- .left { margin-left: 0px; margin-right: auto; text-align: left; }
- .center { margin-left: auto; margin-right: auto; text-align: center; }
- .underline { text-decoration: underline; }
- #postamble p, #preamble p { font-size: 90%; margin: .2em; }
- p.verse { margin-left: 3%; }
- pre {
- border: 1px solid #ccc;
- box-shadow: 3px 3px 3px #eee;
- padding: 8pt;
- font-family: monospace;
- overflow: auto;
- margin: 1.2em;
- }
- pre.src {
- position: relative;
- overflow: visible;
- padding-top: 1.2em;
- }
- pre.src:before {
- display: none;
- position: absolute;
- background-color: white;
- top: -10px;
- right: 10px;
- padding: 3px;
- border: 1px solid black;
- }
- pre.src:hover:before { display: inline;}
- pre.src-sh:before { content: 'sh'; }
- pre.src-bash:before { content: 'sh'; }
- pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
- pre.src-R:before { content: 'R'; }
- pre.src-perl:before { content: 'Perl'; }
- pre.src-java:before { content: 'Java'; }
- pre.src-sql:before { content: 'SQL'; }
-
- table { border-collapse:collapse; }
- caption.t-above { caption-side: top; }
- caption.t-bottom { caption-side: bottom; }
- td, th { vertical-align:top; }
- th.right { text-align: center; }
- th.left { text-align: center; }
- th.center { text-align: center; }
- td.right { text-align: right; }
- td.left { text-align: left; }
- td.center { text-align: center; }
- dt { font-weight: bold; }
- .footpara:nth-child(2) { display: inline; }
- .footpara { display: block; }
- .footdef { margin-bottom: 1em; }
- .figure { padding: 1em; }
- .figure p { text-align: center; }
- .inlinetask {
- padding: 10px;
- border: 2px solid gray;
- margin: 10px;
- background: #ffffcc;
- }
- #org-div-home-and-up
- { text-align: right; font-size: 70%; white-space: nowrap; }
- textarea { overflow-x: auto; }
- .linenr { font-size: smaller }
- .code-highlighted { background-color: #ffff00; }
- .org-info-js_info-navigation { border-style: none; }
- #org-info-js_console-label
- { font-size: 10px; font-weight: bold; white-space: nowrap; }
- .org-info-js_search-highlight
- { background-color: #ffff00; color: #000000; font-weight: bold; }
- /*]]>*/-->
-</style>
-<link rel="stylesheet" type="text/css" href="freedombone.css" />
-<script type="text/javascript">
-/*
-@licstart The following is the entire license notice for the
-JavaScript code in this tag.
-
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-The JavaScript code in this tag is free software: you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License (GNU GPL) as published by the Free Software
-Foundation, either version 3 of the License, or (at your option)
-any later version. The code is distributed WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
-
-As additional permission under GNU GPL version 3 section 7, you
-may distribute non-source (e.g., minimized or compacted) forms of
-that code without the copy of the GNU GPL normally required by
-section 4, provided you include this license notice and a URL
-through which recipients can access the Corresponding Source.
-
-
-@licend The above is the entire license notice
-for the JavaScript code in this tag.
-*/
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
- var target = document.getElementById(id);
- if(null != target) {
- elem.cacheClassElem = elem.className;
- elem.cacheClassTarget = target.className;
- target.className = "code-highlighted";
- elem.className = "code-highlighted";
- }
- }
- function CodeHighlightOff(elem, id)
- {
- var target = document.getElementById(id);
- if(elem.cacheClassElem)
- elem.className = elem.cacheClassElem;
- if(elem.cacheClassTarget)
- target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-</head>
-<body>
-<div id="preamble" class="status">
-<a name="top" id="top"></a>
-</div>
-<div id="content">
-<h1 class="title">Freedombone</h1>
-
-<div class="figure">
-<p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
-</p>
-</div>
-
-<p>
-Most people don't have a static external IP address, so you will need to have an account on a dymanic DNS service. <a href="https://freedns.afraid.org">FreeDNS</a> is the one recommended, but others are available.
-</p>
-
-<p>
-If you want systems to be available within an ordinary web browser, such as Firefox, then you will need to <a href="./domains.html">obtain a domain name</a>.
-</p>
-
-<p>
-A list of other supported ARM boards <a href="./boards.html">can be found here</a>, or you can install onto an old laptop or netbook. Some installation instructions for different use cases are:
-</p>
-
-<ul class="org-ul">
-<li><a href="./homeserver.html">Typical installation</a>
-</li>
-<li>Installing <a href="./beaglebone.html">on a Beaglebone Black</a>
-</li>
-<li>Installing on an <a href="./debianinstall.html">existing Debian system</a>
-</li>
-<li>Installing <a href="./armbian.html">on Armbian</a>, for unsupported ARM boards such as Raspberry Pi
-</li>
-<li>Creating a dedicated <a href="./socialinstance.html">fediverse instance</a> for a single user or to host a community
-</li>
-<li>Deploying a <a href="./mesh.html">mesh network</a> which can operate with or without the internet
-</li>
-<li><a href="./users.html">Adding or removing users</a>
-</li>
-<li><a href="./security.html">Improving security</a>
-</li>
-<li><a href="./mobile.html">Advice on setting up a mobile phone</a>
-</li>
-<li><a href="./apps.html">Apps available on the system</a>
-</li>
-<li><a href="./faq.html">Frequently Asked Questions</a>
-</li>
-</ul>
-</div>
-<div id="postamble" class="status">
-
-<style type="text/css">
-.back-to-top {
- position: fixed;
- bottom: 2em;
- right: 0px;
- text-decoration: none;
- color: #000000;
- background-color: rgba(235, 235, 235, 0.80);
- font-size: 12px;
- padding: 1em;
- display: none;
-}
-
-.back-to-top:hover {
- background-color: rgba(135, 135, 135, 0.50);
-}
-</style>
-
-<div class="back-to-top">
-<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
-</div>
-</div>
-</body>
-</html>
diff --git a/website/EN/release31.html b/website/EN/release31.html
index e469d07bb..c0cb19141 100644
--- a/website/EN/release31.html
+++ b/website/EN/release31.html
@@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title>Freedombone</title>
-<!-- 2018-06-24 Sun 23:04 -->
+<!-- 2018-12-05 Wed 11:24 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="generator" content="Org-mode" />
<meta name="author" content="Bob Mottram" />
@@ -180,7 +180,7 @@ The <a href="./mesh.html">mesh version</a> now supports BMX6, OLSR2 and Babel ro
</p>
<p>
-There is a new <a href="./socialinstance.html">social instance</a> image build option, if you want to be able to rapidly deploy fediverse instances, and a <a href="./devguide.html">template command</a> for quickly adding new apps to the system which automates a lot of the boilerplate.
+There is a new social instance image build option, if you want to be able to rapidly deploy fediverse instances, and a <a href="./devguide.html">template command</a> for quickly adding new apps to the system which automates a lot of the boilerplate.
</p>
<p>
@@ -253,7 +253,7 @@ You will then be shown a new randomly generated password. It's very important th
</p>
<p>
-More detailed installation instructions are linked from <a href="./installmethods.html">the main site</a>.
+More detailed installation instructions are linked from the main site.
</p>
</div>
</div>
diff --git a/website/EN/socialinstance.html b/website/EN/socialinstance.html
deleted file mode 100644
index 365cbbe23..000000000
--- a/website/EN/socialinstance.html
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-<title>Freedombone</title>
-<!-- 2018-06-24 Sun 23:04 -->
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<meta name="generator" content="Org-mode" />
-<meta name="author" content="Bob Mottram" />
-<meta name="description" content="Social Instance"
- />
-<meta name="keywords" content="freedombone, debian, social, fediverse, instance, pleroma, gnusocial, postactiv" />
-<style type="text/css">
- <!--/*--><![CDATA[/*><!--*/
- .title { text-align: center; }
- .todo { font-family: monospace; color: red; }
- .done { color: green; }
- .tag { background-color: #eee; font-family: monospace;
- padding: 2px; font-size: 80%; font-weight: normal; }
- .timestamp { color: #bebebe; }
- .timestamp-kwd { color: #5f9ea0; }
- .right { margin-left: auto; margin-right: 0px; text-align: right; }
- .left { margin-left: 0px; margin-right: auto; text-align: left; }
- .center { margin-left: auto; margin-right: auto; text-align: center; }
- .underline { text-decoration: underline; }
- #postamble p, #preamble p { font-size: 90%; margin: .2em; }
- p.verse { margin-left: 3%; }
- pre {
- border: 1px solid #ccc;
- box-shadow: 3px 3px 3px #eee;
- padding: 8pt;
- font-family: monospace;
- overflow: auto;
- margin: 1.2em;
- }
- pre.src {
- position: relative;
- overflow: visible;
- padding-top: 1.2em;
- }
- pre.src:before {
- display: none;
- position: absolute;
- background-color: white;
- top: -10px;
- right: 10px;
- padding: 3px;
- border: 1px solid black;
- }
- pre.src:hover:before { display: inline;}
- pre.src-sh:before { content: 'sh'; }
- pre.src-bash:before { content: 'sh'; }
- pre.src-emacs-lisp:before { content: 'Emacs Lisp'; }
- pre.src-R:before { content: 'R'; }
- pre.src-perl:before { content: 'Perl'; }
- pre.src-java:before { content: 'Java'; }
- pre.src-sql:before { content: 'SQL'; }
-
- table { border-collapse:collapse; }
- caption.t-above { caption-side: top; }
- caption.t-bottom { caption-side: bottom; }
- td, th { vertical-align:top; }
- th.right { text-align: center; }
- th.left { text-align: center; }
- th.center { text-align: center; }
- td.right { text-align: right; }
- td.left { text-align: left; }
- td.center { text-align: center; }
- dt { font-weight: bold; }
- .footpara:nth-child(2) { display: inline; }
- .footpara { display: block; }
- .footdef { margin-bottom: 1em; }
- .figure { padding: 1em; }
- .figure p { text-align: center; }
- .inlinetask {
- padding: 10px;
- border: 2px solid gray;
- margin: 10px;
- background: #ffffcc;
- }
- #org-div-home-and-up
- { text-align: right; font-size: 70%; white-space: nowrap; }
- textarea { overflow-x: auto; }
- .linenr { font-size: smaller }
- .code-highlighted { background-color: #ffff00; }
- .org-info-js_info-navigation { border-style: none; }
- #org-info-js_console-label
- { font-size: 10px; font-weight: bold; white-space: nowrap; }
- .org-info-js_search-highlight
- { background-color: #ffff00; color: #000000; font-weight: bold; }
- /*]]>*/-->
-</style>
-<link rel="stylesheet" type="text/css" href="freedombone.css" />
-<script type="text/javascript">
-/*
-@licstart The following is the entire license notice for the
-JavaScript code in this tag.
-
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
-
-The JavaScript code in this tag is free software: you can
-redistribute it and/or modify it under the terms of the GNU
-General Public License (GNU GPL) as published by the Free Software
-Foundation, either version 3 of the License, or (at your option)
-any later version. The code is distributed WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU GPL for more details.
-
-As additional permission under GNU GPL version 3 section 7, you
-may distribute non-source (e.g., minimized or compacted) forms of
-that code without the copy of the GNU GPL normally required by
-section 4, provided you include this license notice and a URL
-through which recipients can access the Corresponding Source.
-
-
-@licend The above is the entire license notice
-for the JavaScript code in this tag.
-*/
-<!--/*--><![CDATA[/*><!--*/
- function CodeHighlightOn(elem, id)
- {
- var target = document.getElementById(id);
- if(null != target) {
- elem.cacheClassElem = elem.className;
- elem.cacheClassTarget = target.className;
- target.className = "code-highlighted";
- elem.className = "code-highlighted";
- }
- }
- function CodeHighlightOff(elem, id)
- {
- var target = document.getElementById(id);
- if(elem.cacheClassElem)
- elem.className = elem.cacheClassElem;
- if(elem.cacheClassTarget)
- target.className = elem.cacheClassTarget;
- }
-/*]]>*///-->
-</script>
-</head>
-<body>
-<div id="preamble" class="status">
-<a name="top" id="top"></a>
-</div>
-<div id="content">
-<h1 class="title">Freedombone</h1>
-
-<div class="figure">
-<p><img src="images/logo.png" alt="logo.png" width="80%" height="10%" align="center" />
-</p>
-</div>
-
-<div id="outline-container-sec-1" class="outline-2">
-<h2 id="sec-1">Social Instance</h2>
-<div class="outline-text-2" id="text-1">
-<p>
-A social instance image allows you to easily set up a fediverse server, which federates using the OStatus or ActivityPub protocol. You will need:
-</p>
-
-<ul class="org-ul">
-<li>An old laptop, capable of booting from USB
-</li>
-<li>A USB drive, preferably Sandisk and 16GB or larger
-</li>
-<li>An ethernet patch cable
-</li>
-<li>A domain name of your own
-</li>
-<li>A dynamic DNS account
-</li>
-<li>Ability to alter settings on your internet router
-</li>
-</ul>
-
-<p>
-The installation process is the same as usual, with the only difference being that on initial setup it will go straight to the domain setup details for your instance. In summary:
-</p>
-</div>
-</div>
-
-<div id="outline-container-sec-2" class="outline-2">
-<h2 id="sec-2">Copy the image to the USB drive</h2>
-<div class="outline-text-2" id="text-2">
-<p>
-Substitute <b>sdX</b> with the device name for your USB drive.
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-bash">sudo apt-get install xz-utils nodejs
-npm install -g dat
-dat clone dat://231b24dbeef3c3f7b115b9c7cd02e416b382df0a1050ef66f94b988fc8dae92e/
-cd 231b24dbeef3c3f7b115b9c7cd02e416b382df0a1050ef66f94b988fc8dae92e
-gpg --verify freedombone-pleroma-amd64.img.xz.sig
-unxz freedombone-pleroma-amd64.img.xz
-sudo dd if=/dev/zero of=/dev/sdX bs=32M count=8
-sudo dd bs=32M if=freedombone-pleroma-amd64.img of=/dev/sdX conv=fdatasync,sync,noerror
-</pre>
-</div>
-
-<p>
-Also note that if the laptop has a removable SSD drive it's possible to copy the image directly to that if you have enough equipment.
-</p>
-</div>
-</div>
-
-<div id="outline-container-sec-3" class="outline-2">
-<h2 id="sec-3">Connect the laptop to your internet router</h2>
-<div class="outline-text-2" id="text-3">
-<p>
-Plug the USB drive into the laptop and connect it to your internet router with the ethernet cable.
-</p>
-
-
-<div class="figure">
-<p><img src="images/laptop_router.jpg" alt="laptop_router.jpg" width="100%" align="center" />
-</p>
-</div>
-</div>
-</div>
-
-<div id="outline-container-sec-4" class="outline-2">
-<h2 id="sec-4">Boot the laptop from the USB drive</h2>
-<div class="outline-text-2" id="text-4">
-<p>
-You may need to alter the BIOS settings to get this to work reliably.
-</p>
-
-
-<div class="figure">
-<p><img src="images/bios_boot_usb.jpg" alt="bios_boot_usb.jpg" width="100%" align="center" />
-</p>
-</div>
-</div>
-</div>
-
-<div id="outline-container-sec-5" class="outline-2">
-<h2 id="sec-5">Forward ports 80 (HTTP) and 443 (HTTPS) from your internet router to the laptop</h2>
-<div class="outline-text-2" id="text-5">
-<p>
-Log into your internet router using a non-Tor browser (usually it's on an address like 192.168.1.1 or 192.168.1.254). Often port forwarding settings are together with firewall settings.
-</p>
-
-
-<div class="figure">
-<p><img src="images/port_forwarding.png" alt="port_forwarding.png" width="100%" align="center" />
-</p>
-</div>
-</div>
-</div>
-
-<div id="outline-container-sec-6" class="outline-2">
-<h2 id="sec-6">From another machine ssh into the laptop</h2>
-<div class="outline-text-2" id="text-6">
-<div class="org-src-container">
-
-<pre class="src src-bash">ssh fbone@freedombone.local -p 2222
-</pre>
-</div>
-
-<p>
-Or alternatively you can log in directly on the laptop. The initial username is <b>fbone</b> and the password is <b>freedombone</b>. You should make sure you write down or copy the new password when it is shown.
-</p>
-</div>
-</div>
-
-<div id="outline-container-sec-7" class="outline-2">
-<h2 id="sec-7">Follow the setup procedure</h2>
-<div class="outline-text-2" id="text-7">
-<p>
-Enter your user details, domain name and dynamic DNS settings.
-</p>
-</div>
-</div>
-
-<div id="outline-container-sec-8" class="outline-2">
-<h2 id="sec-8">When installation is complete</h2>
-<div class="outline-text-2" id="text-8">
-<p>
-Navigate to your domain and register a new user.
-</p>
-
-
-<div class="figure">
-<p><img src="images/pleroma_register.jpg" alt="pleroma_register.jpg" width="100%" align="center" />
-</p>
-</div>
-
-<p>
-More details about setting up and using Pleroma <a href="./app_pleroma.html">can be found here</a>.
-</p>
-
-
-<div class="figure">
-<p><img src="images/tusky.jpg" alt="tusky.jpg" width="50%" align="center" />
-</p>
-</div>
-</div>
-</div>
-</div>
-<div id="postamble" class="status">
-
-<style type="text/css">
-.back-to-top {
- position: fixed;
- bottom: 2em;
- right: 0px;
- text-decoration: none;
- color: #000000;
- background-color: rgba(235, 235, 235, 0.80);
- font-size: 12px;
- padding: 1em;
- display: none;
-}
-
-.back-to-top:hover {
- background-color: rgba(135, 135, 135, 0.50);
-}
-</style>
-
-<div class="back-to-top">
-<a href="#top">Back to top</a> | <a href="mailto:bob@freedombone.net">E-mail me</a>
-</div>
-</div>
-</body>
-</html>
--
GitLab