From 2bc45a7f485616f568351dd542601db35d5deb9b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 23 Jun 2023 01:29:39 +0200 Subject: [PATCH] install: stop advertising the internet cube and LIME1/LIME2 images, they are outdated as hell, we don't have manpower to maintain those build --- pages/02.administer/10.install/install.fr.md | 12 +++++++++--- pages/02.administer/10.install/install.md | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pages/02.administer/10.install/install.fr.md b/pages/02.administer/10.install/install.fr.md index 7ad01a79..bca0a715 100644 --- a/pages/02.administer/10.install/install.fr.md +++ b/pages/02.administer/10.install/install.fr.md @@ -29,7 +29,7 @@ routes: - '/hardware' --- {% 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 arm, at_home, regular, rpi2plus, rpi1, rpi0, show_legacy_arm_menu, 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, false %} {% set hardware = uri.param('hardware') %} {% if hardware == 'regular' %} @@ -37,6 +37,7 @@ routes: {% elseif hardware == 'internetcube' %} {% set arm, arm_sup, internetcube = true, true, true %} {% set image_type = 'La Brique Internet' %} + {% set show_legacy_arm_menu = true %} {% elseif hardware == 'rpi2plus' %} {% set arm, rpi2plus = true, true %} {% elseif hardware == 'rpi1' %} @@ -45,8 +46,13 @@ routes: {% set arm, rpi0 = true, true %} {% elseif hardware == 'arm_sup' %} {% set arm, arm_sup = true, true %} + {% set show_legacy_arm_menu = true %} +{% elseif hardware == 'arm' %} + {% set arm, arm_unsup = true, true %} + {% set image_type = 'Armbian' %} {% elseif hardware == 'arm_unsup' %} {% set arm, arm_unsup = true, true %} + {% set show_legacy_arm_menu = true %} {% set image_type = 'Armbian' %} {% elseif hardware == 'vps_debian' %} {% set vps, vps_debian = true, true %} @@ -74,7 +80,7 @@ Sélectionnez le matériel sur lequel vous souhaitez installer YunoHost : [/div] [div class="flex-child hardware{%if arm_sup or arm_unsup or internetcube %} active{% endif %}"] -[[figure caption="Carte ARM"]![](image://olinuxino.jpg?height=75)[/figure]](/install/hardware:arm_sup) +[[figure caption="Carte ARM"]![](image://olinuxino.jpg?height=75)[/figure]](/install/hardware:arm) [/div] [div class="flex-child hardware{%if regular %} active{% endif %}"] @@ -100,7 +106,7 @@ Sélectionnez le matériel sur lequel vous souhaitez installer YunoHost : [div class="flex-child hardware{%if rpi0 %} active{% endif %}"] [[figure caption="Raspberry Pi zero"]![](image://rpi0.jpg?height=50)[/figure]](/install/hardware:rpi0) [/div] -{% elseif arm_sup or arm_unsup or internetcube %} +{% elseif show_legacy_arm_menu %} [div class="flex-child hardware{%if internetcube %} active{% endif %}"] [[figure caption="La Brique Internet avec un VPN"]![](image://internetcube.png?height=50)[/figure]](/install/hardware:internetcube) diff --git a/pages/02.administer/10.install/install.md b/pages/02.administer/10.install/install.md index 97cacb31..0b0938ed 100644 --- a/pages/02.administer/10.install/install.md +++ b/pages/02.administer/10.install/install.md @@ -29,7 +29,7 @@ routes: - '/hardware' --- {% set image_type = 'YunoHost' %} -{% set arm, at_home, regular, rpi2plus, rpi1, rpi0, arm_sup, arm_unsup, vps, vps_debian, vps_ynh, virtualbox, wsl, internetcube, docker = false, false, false, false, false, false, false, false, false, false, false, false, false, false, false %} +{% set arm, at_home, regular, rpi2plus, rpi1, rpi0, show_legacy_arm_menu, arm_sup, arm_unsup, vps, vps_debian, vps_ynh, virtualbox, wsl, internetcube, docker = false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false %} {% set hardware = uri.param('hardware') %} {% if hardware == 'regular' %} @@ -37,6 +37,7 @@ routes: {% elseif hardware == 'internetcube' %} {% set arm, arm_sup, internetcube = true, true, true %} {% set image_type = 'Internet Cube' %} + {% set show_legacy_arm_menu = true %} {% elseif hardware == 'rpi2plus' %} {% set arm, rpi2plus = true, true %} {% elseif hardware == 'rpi1' %} @@ -45,8 +46,13 @@ routes: {% set arm, rpi0 = true, true %} {% elseif hardware == 'arm_sup' %} {% set arm, arm_sup = true, true %} + {% set show_legacy_arm_menu = true %} +{% elseif hardware == 'arm' %} + {% set arm, arm_unsup = true, true %} + {% set image_type = 'Armbian' %} {% elseif hardware == 'arm_unsup' %} {% set arm, arm_unsup = true, true %} + {% set show_legacy_arm_menu = true %} {% set image_type = 'Armbian' %} {% elseif hardware == 'vps_debian' %} {% set vps, vps_debian = true, true %} @@ -76,7 +82,7 @@ Select the hardware on which you want install YunoHost : [/div] [div class="flex-child hardware{%if arm_sup or arm_unsup or internetcube %} active{% endif %}"] -[[figure caption="ARM board"]![](image://olinuxino.jpg?height=75)[/figure]](/install/hardware:arm_sup) +[[figure caption="ARM board"]![](image://olinuxino.jpg?height=75)[/figure]](/install/hardware:arm) [/div] [div class="flex-child hardware{%if regular %} active{% endif %}"] @@ -106,7 +112,7 @@ Select the hardware on which you want install YunoHost : [div class="flex-child hardware{%if rpi0 %} active{% endif %}"] [[figure caption="Raspberry Pi zero"]![](image://rpi0.jpg?height=50)[/figure]](/install/hardware:rpi0) [/div] -{% elseif arm_sup or arm_unsup or internetcube %} +{% elseif show_legacy_arm_menu %} [div class="flex-child hardware{%if internetcube %} active{% endif %}"] [[figure caption="Internet cube With VPN"]![](image://internetcube.png?height=50)[/figure]](/install/hardware:internetcube)