Update install_on_raspberry.md

install_on_raspberry.md

@@ -1,21 +1,23 @@
 # Install YunoHost on a Raspberry Pi
 
-*Find other ways to install YunoHost **[here](/install)**.*
+*Find all the ways to install YunoHost **[here](/install)**.*
+
+<center>
+<img src="https://cdn.shopify.com/s/files/1/0176/3274/products/rpi2b_1024x1024.jpg" width=350>
+</center>
+
+<div class="alert alert-info" markdown="1">
+Before setting up a server at home, it is recommended that you know the [limitations imposed by your ISP](/isp). If they are too restrictive you can consider using a VPN to get around those limitations.
+</div>
 
 ## Pre-requisite
-<img src="/images/Raspberry_Pi_2_Model_B_v1.1_front_angle_new.jpg" width=350>
-<img src="/images/micro-sd-card.jpg">
 
-- A Raspberry Pi model 1, 2 or 3
+- A Raspberry Pi model 0, 1, 2 or 3
-- An SD card: **4GB** capacity (or more) and **class10** speed rate is highly recommended
+- An SD card: **4GB** capacity (or more) and **class10** speed rate is highly recommended (like the [Transcend 300x](http://www.amazon.fr/Transcend-microSDHC-adaptateur-TS32GUSDU1E-Emballage/dp/B00CES44EO))
-- An other computer to read this guide and access to your Raspberry Pi
+- A power supply (either an adapter or a MicroUSB cable)
-- A screen and a keyboard are recommended to control your Raspberry Pi if a problem occurs.
+- An ethernet cable (RJ-45) to connect your Raspberry Pi to your router. (Raspberry Pi Zero users can connect the Pi using an OTG cable, Wifi dongle and [following these instructions](https://davidmaitland.me/2015/12/raspberry-pi-zero-headless-setup/))
-- A [reasonable ISP](/isp), preferably with a good and unlimited upstream bandwidth
+- **YunoHost Raspberry Pi image**, availabe on [build.yunohost.org](http://build.yunohost.org/). Not needed if you want to manually install YunoHost on a existing Debian system.
-- **YunoHost Raspberry Pi images**, available here:
+- **(Optional)** A screen and a keyboard, if you can't use an ssh connection to proceed to the post-installation. **Note:** not needed when installing with an image.
-
-build.yunohost.org
-
-There are two ways of installing, depending on if you can start your server from scratch or not.
 
 ---
 
@@ -25,13 +27,24 @@ There are two ways of installing, depending on if you can start your server from
 
 <a class="btn btn-lg btn-default" href="/plug_and_boot">2. Plug & boot</a>
 
-<a class="btn btn-lg btn-default" href="/postinstall">3. Post-install</a>
+<a class="btn btn-lg btn-default" href="/ssh">3. Connect to your server with SSH</a>
+<!-- [TODO : Cette partie n'est pas triviale et dois être détaillée comme pour OLinuXino !!] -->
+
+<a class="btn btn-lg btn-default" href="/postinstall">4. Post-install</a>
+
+---
 
 ## Manual installation
 
-Follow these steps if you can't start from scratch and simply use an image. Note - Yunohost installation is different if you have a Raspberry Pi Zero, be careful!
 
-1. Install git
+0. Install Raspbian on the SD card and connect to your Pi.
+
+1. The root user must have a password, or the installation will fail. To change the root password:
+```bash
+sudo passwd root
+```
+
+2. Install git
 ```bash
 sudo apt-get install git
 ```
@@ -41,52 +54,11 @@ sudo apt-get install git
 git clone https://github.com/YunoHost/install_script /tmp/install_script
 ```
 
-3. The root user must have a password set, if it isn't the case, set it (whithout the install script failed):
-```bash
-sudo passwd root
-```
-
-4. Update the Pi: 
-```bash
-apt-get update ; apt-get dist-upgrade -y ; apt-get install rpi-update ; rpi-update ; reboot`
-```
-
-This will upgrade the Pi, then reboot.
-
-<div class="alert alert-info">
-<b>Raspberry Pi Zero users:</b> follow these specific steps for a successfull installation.
-
-</div>
-
-0.1 Install metronome manually:
-```bash
-apt-get install -y ssl-cert lua-event lua-expat lua-socket lua-sec lua-filesystem
-wget https://github.com/YunoHost/metronome/archive/debian/3.7.9+33b7572-1.zip
-unzip 3.7.9+33b7572-1.zip
-cd metronome-debian-3.7.9-33b7572-1
-dpkg-buildpackage -rfakeroot -uc -b -d
-cd ..
-dpkg -i metronome_3.7.9+33b7572-1_armhf.deb
-apt-mark hold metronome
-```
-
 4. Execute the installation script
 ```bash
 cd /tmp/install_script && sudo ./install_yunohost
 ```
----
-
-### Recommended after post-installation
-
-* Connect via SSH: **root@IP.OF.RPI** (password: **yunohost**)
-* Change root password: `passwd root`
-* Upgrade system: `apt-get update && apt-get dist-upgrade && rpi-update`
-* Configure the language, keyboard layout and timezone with the **raspi-config** tool
 
 ---
 
-#### Build image
-* [Create a Raspberry Pi image](/build_arm_image_en)
-
 ***If you need help during one of these steps, do not hesitate to use [our support tools](/support).***
-