From 932325ad72785ecbfc7513b68e3ca05f72b2f98d Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 11 Feb 2021 02:06:30 +0100 Subject: [PATCH 1/3] [enh] Add hotfix instructions on raspberry pi zero and 1 --- pages/01.administrate/05.install/install.md | 29 +++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pages/01.administrate/05.install/install.md b/pages/01.administrate/05.install/install.md index cd94dda3..89596a5d 100644 --- a/pages/01.administrate/05.install/install.md +++ b/pages/01.administrate/05.install/install.md @@ -407,6 +407,35 @@ You should see a screen like this: {% endif %} +{% if rpi1 or rpi0 %} +## [fa=bug /] Hotfix the image +Raspberry pi 1 or zero are not totally supported due to issues with metronome (XMPP) and with miniupnpc (router autoconfig). + +However, it is possible to fix by yourself the image before to run the initial configuration. + +To achieve this, you need to connect on your raspberry pi as root user [via SSH](/ssh) with the temporary password `yunohost`: +``` +ssh root@yunohost.local +``` + +Then run the following commands to work around the metronome issue: +``` +mv /usr/bin/metronome{,.bkp} +mv /usr/bin/metronomectl{,.bkp} +ln -s /usr/bin/true /usr/bin/metronome +ln -s /usr/bin/true /usr/bin/metronomectl +``` + +And this one to work around the upnpc issue: +``` +sed -i 's/import miniupnpc/#import miniupnpc/g' /usr/lib/moulinette/yunohost/firewall.py +``` + +! This last command need to be run after each yunohost upgrade :/ + +{% endif %} + + {% elseif vps_debian %} ## [fa=rocket /] Run the install script From 397db42d02642dbfe961681017c157ffdb076a5f Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 11 Feb 2021 02:41:57 +0100 Subject: [PATCH 2/3] [enh] Armbian install process --- pages/01.administrate/05.install/install.md | 33 ++++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pages/01.administrate/05.install/install.md b/pages/01.administrate/05.install/install.md index a3723baa..fbf5651c 100644 --- a/pages/01.administrate/05.install/install.md +++ b/pages/01.administrate/05.install/install.md @@ -27,6 +27,7 @@ routes: - '/boot_and_graphical_install' - '/postinstall' --- +{% set image_name = 'YunoHost' %} {% set arm, at_home, regular, rpi2plus, rpi1, rpi0, arm_sup, arm_unsup, vps, vps_debian, vps_ynh, virtualbox, internetcube, docker = false, false, false, false, false, false, false, false, false, false, false, false, false, false %} {% set hardware = uri.param('hardware') %} {% if hardware == '' %} @@ -37,6 +38,7 @@ routes: {% set regular = true %} {% elseif hardware == 'internetcube' %} {% set arm, arm_sup, internetcube = true, true, true %} + {% set image_type = 'Internet Cube' %} {% elseif hardware == 'rpi2plus' %} {% set arm, rpi2plus = true, true %} {% elseif hardware == 'rpi1' %} @@ -47,6 +49,7 @@ routes: {% set arm, arm_sup = true, true %} {% elseif hardware == 'arm_unsup' %} {% set arm, arm_unsup = true, true %} + {% set image_type = 'Armbian' %} {% elseif hardware == 'vps_debian' %} {% set vps, vps_debian = true, true %} {% elseif hardware == 'vps_ynh' %} @@ -210,7 +213,7 @@ Here are some VPS providers supporting YunoHost natively : {% if at_home %} -## [fa=download /] Download the pre-installed image +## [fa=download /] Download the {{image_type}} image {% if virtualbox %} !!! If your host OS is 32 bits, be sure to download the 32-bit image. @@ -278,22 +281,26 @@ $(document).ready(function () { + + + + {% if not virtualbox %} {% if arm %} -## ![microSD card with adapter](image://sdcard_with_adapter.png?resize=100,75&class=inline) Flash the YunoHost image +## ![microSD card with adapter](image://sdcard_with_adapter.png?resize=100,75&class=inline) Flash the {{image_type}} image {% else %} ## ![USB drive](image://usb_key.png?resize=100,100&class=inline) Flash the YunoHost image {% endif %} -Now that you downloaded the image of YunoHost, you should flash it on {% if arm %}a SD card{% else %}a USB stick or a CD.{% endif %} +Now that you downloaded the image of {image_type}, you should flash it on {% if arm %}a SD card{% else %}a USB stick or a CD.{% endif %} [ui-tabs position="top-left" active="0" theme="lite"] [ui-tab title="(Recommended) With Etcher"] Download Etcher for your operating system and install it. -Plug your {% if arm %}SD card{% else %}USB stick{% endif %}, select your YunoHost image and click "Flask" +Plug your {% if arm %}SD card{% else %}USB stick{% endif %}, select your image and click "Flask" ![Etcher](image://etcher.gif?resize=700&class=inline) @@ -302,7 +309,7 @@ Plug your {% if arm %}SD card{% else %}USB stick{% endif %}, select your YunoHos Download [USBimager](https://bztsrc.gitlab.io/usbimager/) for your operating system and install it. -Plug your {% if arm %}SD card{% else %}USB stick{% endif %}, select your YunoHost image and click "Write" +Plug your {% if arm %}SD card{% else %}USB stick{% endif %}, select your image and click "Write" ![USBimager](image://usbimager.png?resize=700&class=inline) @@ -408,7 +415,7 @@ You should see a screen like this: {% if rpi1 or rpi0 %} -## [fa=bug /] Hotfix the image +## [fa=bug /] Connect to the board and hotfix the image Raspberry pi 1 or zero are not totally supported due to issues with metronome (XMPP) and with miniupnpc (router autoconfig). However, it is possible to fix by yourself the image before to run the initial configuration. @@ -433,11 +440,21 @@ sed -i 's/import miniupnpc/#import miniupnpc/g' /usr/lib/moulinette/yunohost/fir ! This last command need to be run after each yunohost upgrade :/ +{% elseif arm_unsup %} +## [fa=bug /] Connect to the board + +Next you need to [find the local IP address of your server](/finding_the_local_ip) to connect as root user [via SSH](/ssh) with the temporary password `1234`. + +``` +ssh root@192.168.x.xxx +``` + +{% endif %} + {% endif %} - -{% elseif vps_debian %} +{% if vps_debian or arm_unsup %} ## [fa=rocket /] Run the install script Once you have access to a command line on your server (either directly or [through SSH](/ssh)), you can install YunoHost by running (as root) : From f230661613db32a128b9a2c888009bcf53242021 Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 11 Feb 2021 03:15:15 +0100 Subject: [PATCH 3/3] [fix] Some install process was uncomplete --- .../02.findinglocalip/finding_the_local_ip.md | 1 + pages/01.administrate/05.install/install.md | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pages/01.administrate/05.install/02.findinglocalip/finding_the_local_ip.md b/pages/01.administrate/05.install/02.findinglocalip/finding_the_local_ip.md index 1da5bf22..b18a0140 100644 --- a/pages/01.administrate/05.install/02.findinglocalip/finding_the_local_ip.md +++ b/pages/01.administrate/05.install/02.findinglocalip/finding_the_local_ip.md @@ -13,6 +13,7 @@ The local IP is the address used to refer to your server inside the local networ Any of these tricks should allow you to find the local IP of your server: +- Use the [AngryIP](https://angryip.org/download/) software - Connect to your internet box / router interface to list the machines connected, or check the logs; - If you're using Linux, you can open a terminal and use `sudo arp-scan --local` to list the IP on your local network (this may also work in Windows); - If the `arp-scan` command displays a confusing number of devices, you can check which ones are open to SSH with `nmap -p 22 192.168.1.0/24` to sort them out (adapt the IP range to your local network) diff --git a/pages/01.administrate/05.install/install.md b/pages/01.administrate/05.install/install.md index fbf5651c..89c3297c 100644 --- a/pages/01.administrate/05.install/install.md +++ b/pages/01.administrate/05.install/install.md @@ -27,7 +27,7 @@ routes: - '/boot_and_graphical_install' - '/postinstall' --- -{% set image_name = 'YunoHost' %} +{% set image_type = 'YunoHost' %} {% set arm, at_home, regular, rpi2plus, rpi1, rpi0, arm_sup, arm_unsup, vps, vps_debian, vps_ynh, virtualbox, internetcube, docker = false, false, false, false, false, false, false, false, false, false, false, false, false, false %} {% set hardware = uri.param('hardware') %} {% if hardware == '' %} @@ -217,6 +217,14 @@ Here are some VPS providers supporting YunoHost natively : {% if virtualbox %} !!! If your host OS is 32 bits, be sure to download the 32-bit image. +{% elseif arm_unsup %} +
+
+
+ [fa=download] Download +
+
+
{% endif %} @@ -293,7 +301,7 @@ $(document).ready(function () { ## ![USB drive](image://usb_key.png?resize=100,100&class=inline) Flash the YunoHost image {% endif %} -Now that you downloaded the image of {image_type}, you should flash it on {% if arm %}a SD card{% else %}a USB stick or a CD.{% endif %} +Now that you downloaded the image of {{image_type}}, you should flash it on {% if arm %}a SD card{% else %}a USB stick or a CD.{% endif %} [ui-tabs position="top-left" active="0" theme="lite"] [ui-tab title="(Recommended) With Etcher"]