Merge branch 'master' into pr/1935

.gitignore

@@ -2,4 +2,6 @@
 !/pages
 !/images
 !/themes
-/themes/learn4
+!/Dockerfile
+!/docker-compose.yml
+!/dev/plugins

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "themes/learn4"]
+	path = themes/learn4
+	url = https://github.com/getgrav/grav-theme-learn4.git

Dockerfile

@@ -0,0 +1,89 @@
+FROM php:7.4-apache
+LABEL maintainer="Andy Miller <rhuk@getgrav.org> (@rhukster)"
+
+RUN usermod  --uid 1000 www-data
+RUN groupmod --gid 1000 www-data
+# Enable Apache Rewrite + Expires Module
+RUN a2enmod rewrite expires && \
+    sed -i 's/ServerTokens OS/ServerTokens ProductOnly/g' \
+    /etc/apache2/conf-available/security.conf
+
+# Install dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    unzip \
+    libfreetype6-dev \
+    libjpeg62-turbo-dev \
+    libpng-dev \
+    libyaml-dev \
+    libzip4 \
+    libzip-dev \
+    zlib1g-dev \
+    libicu-dev \
+    g++ \
+    git \
+    cron \
+    vim \
+    && docker-php-ext-install opcache \
+    && docker-php-ext-configure intl \
+    && docker-php-ext-install intl \
+    && docker-php-ext-configure gd --with-freetype --with-jpeg \
+    && docker-php-ext-install -j$(nproc) gd \
+    && docker-php-ext-install zip \
+    && rm -rf /var/lib/apt/lists/*
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+    echo 'opcache.memory_consumption=128'; \
+    echo 'opcache.interned_strings_buffer=8'; \
+    echo 'opcache.max_accelerated_files=4000'; \
+    echo 'opcache.revalidate_freq=2'; \
+    echo 'opcache.fast_shutdown=1'; \
+    echo 'opcache.enable_cli=1'; \
+    echo 'upload_max_filesize=128M'; \
+    echo 'post_max_size=128M'; \
+    echo 'expose_php=off'; \
+    } > /usr/local/etc/php/conf.d/php-recommended.ini
+
+RUN pecl install apcu \
+    && pecl install yaml-2.0.4 \
+    && docker-php-ext-enable apcu yaml
+
+CMD ["sh", "-c", "usermod --uid 1000 www-data"]
+CMD ["sh", "-c", "groupmod --gid 1000 www-data"]
+# Set user to www-data
+RUN chown www-data:www-data /var/www
+USER www-data
+
+# Define Grav specific version of Grav or use latest stable
+ARG GRAV_VERSION=latest
+
+# Install grav
+WORKDIR /var/www
+RUN curl -o grav-admin.zip -SL https://getgrav.org/download/core/grav-admin/${GRAV_VERSION} && \
+    unzip grav-admin.zip && \
+    mv -T /var/www/grav-admin /var/www/html && \
+    rm grav-admin.zip
+
+# Install plugins
+WORKDIR /var/www/html
+
+RUN bin/gpm install admin email feed git-sync langswitcher presentation shortcode-core anchors error flex-objects highlight login presentation-deckset tntsearch breadcrumbs external_links form image-captions markdown-notices problems
+
+# Create cron job for Grav maintenance scripts
+RUN (crontab -l; echo "* * * * * cd /var/www/html;/usr/local/bin/php bin/grav scheduler 1>> /dev/null 2>&1") | crontab -
+
+# Return to root user
+USER root
+
+# Copy init scripts
+# COPY docker-entrypoint.sh /entrypoint.sh
+
+COPY --chown=1000:1000 themes/learn4 /var/www/html/user/themes/learn4
+
+# provide container inside image for data persistence
+VOLUME ["/var/www/html/backup", "/var/www/html/user/themes/yunohost-docs", "/var/www/html/logs", "/var/www/html/user/pages", "/var/www/html/user/config", "/var/www/html/user/images"]
+
+# ENTRYPOINT ["/entrypoint.sh"]
+# CMD ["apache2-foreground"]
+CMD ["sh", "-c", "cron && apache2-foreground"]

README.md

@@ -7,8 +7,20 @@ Please report [issues on YunoHost bugtracker](https://github.com/YunoHost/issues
 
 # Contributing
 
+This repo use a **submodule** to provide the theme. So when you clone use: 
+
+```shell
+git clone --recursive https://github.com/YunoHost/doc.git
+```
+
+
 You can refer to the page on [writing documentation](https://yunohost.org/write_documentation).
 
+If you know docker, you can run:
+```
+docker-compose up
+```
+
 ## Regenerate the css
 
 We use scss to manage the css. If you want to change it, you must rebuild it.

docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3"
+services:
+  grav:
+    build: ./
+    ports:
+      - 8000:80
+    volumes:
+      - ./themes/yunohost-docs:/var/www/html/user/themes/yunohost-docs
+      - ./config:/var/www/html/user/config
+      - ./pages:/var/www/html/user/pages
+      - ./images:/var/www/html/user/images
+#  tntsearch:
+#    restart: "no"
+#    build: ./
+#    volumes:
+#      - ./config:/var/www/html/user/config
+#      - ./pages:/var/www/html/user/pages
+#    command: bin/plugin tntsearch index

pages/01.administrate/06.overview/06.apps/apps_overview.md

@@ -1,48 +0,0 @@
----
-title: Applications
-template: docs
-taxonomy:
-    category: docs
-routes:
-  default: '/apps_overview'
----
-
-One of the key feature of YunoHost is the ability to easily install applications which are then immediately usable. Example of applications include a blog system, a "cloud" (to host and sync files), a website, an RSS reader...
-
-Applications can be installed and managed through the webadmin interface in 'Applications' or through commands of the `yunohost app` category.
-
-The application catalog can be browsed in the webadmin (in Applications > Install) or [here](/apps).
-
-! Be careful to stay reasonable on the number of installed applications. Each additional installation increases the attack surface and the risk of failure. Ideally, if you want to test, do it with another instance for example in [a virtual machine](/install/hardware:virtualbox).
-
-Applications must be packaged manually by application packagers/maintainers. Apps can be integrated with YunoHost to support upgrades, backup/restore and LDAP/SSO integration among other things.
-
-## Instructions after installation
-
-Some applications need to give you instructions, URLs or credentials once they are installed. So remember to check the email of the first user account.
-
-## Integration and quality levels
-
-Automated tests are being run regularly to test the integration and quality of all apps who were declared to be 'working' by packagers. The result is a level between 0 and 8, whose meaning is detailed on [this page](/packaging_apps_levels). Some tests results may also be available [on this dashboard](https://dash.yunohost.org/appci/branch/stable).
-
-By default, only applications of sufficient quality are offered. When the quality of an application drops, updates are put on hold and installation is no longer possible, until the problem is resolved.
-
-## LDAP / SSO integration
-
-Applications may support integration with the LDAP / Single Sign On system, such that users who connects to the user portal can be automatically logged in all those apps. Some applications however do not support this as it can be either not implemented in the upstream, or the package didn't work on this part yet. This information is usually available on the README of the application package.
-
-## Multi-instance applications
-
-Some applications support the ability to be installed several times (at different locations) ! To do so, just go another time in Applications > Install, and select again the application to install.
-
-## Tile management
-
-Web applications can provide tiles available from the user portal, it is possible to choose whether or not to display them and redefine the text via the web administration interface `Applications > APP name > Operations > Manage labels and tiles` or via the command line: `yunohost app change-label <app> "New text"`.
-
-## User access management
-
-Access to apps can be restricted to some users only. This can be configured via the webadmin in the [Groups and permissions panel](/groups_and_permissions), or similarly via the command-line subcategory `yunohost user permission`.
-
-## Applications packaging 
-
-If you want to learn or contribute to app packaging, please check the [contributor documentation](/contributordoc). 

pages/01.administrate/06.overview/07.domains/domains.md

@@ -1,77 +0,0 @@
----
-title: Domains, DNS conf, and certificate
-template: docs
-taxonomy:
-    category: docs
-routes:
-  default: '/domains'
----
-
-YunoHost allows you to manage and serve several domains on the same server. For instance, you can host a blog and Nextcloud on a first domain `yolo.com`, and a web mail client on a second domain `swag.nohost.me`. Each domain is automatically configured to handle web services, mail services and XMPP services.
-
-Domains can be managed in the 'Domain' section of the webadmin, or through the `yunohost domain` category of the command line.
-
-Each time you add a domain, it is expected that you bought it (or own it) on a domain registrar, so you can manage the [DNS configuration](/dns_config). The exception is the [`.nohost.me`, `.noho.st` and `ynh.fr` domains](/dns_nohost_me) which are paid for by the YunoHost Project, and can be directly integrated with YunoHost thanks to an automated dynDNS setup. To limit costs and abuses, each instance may only have one of these domains setup at any given time, however you can add as many sub-domains of it as you wish. For example, if you choose `example.noho.st` you can later add the domains `video.example.noho.st` or `www.example.ynh.noho.st` or any other sub-domain you may need.
-
-The domain chosen during the initial configuration (post-install) is defined as the main domain of the server : this is where the SSO and the web admin interface will be available. The main domain can later be changed through the web admin in Domains > (the domain) > Set default, or with the command line `yunohost tools maindomain`.
-
-Finally, take note that, in the context of YunoHost, there is no hierarchy between the domains it knows. In the previous example, you may add a third domain `foo.yolo.com` - but it would be considered as a domain independent of `yolo.com`.
-
-## Non-latin characters
-
-If your domain has special, non-latin characters, you need to use its [internationalized version](https://en.wikipedia.org/wiki/Internationalized_domain_name) through [Punycode](https://en.wikipedia.org/wiki/Punycode). You can use [this converter](https://www.charset.org/punycode), and use the converted domain name in your YunoHost configuration. 
-
-## Local domains
-
-Starting from YunoHost v4.3, domains ending by `.local` are fully supported, in addition to the default `yunohost.local`.
-They do not use the DNS protocol, but the mDNS one (also known as Zeroconf, Bonjour), which allows them to be published with no specific configuration but exclusively on your local network or VPN.
-Their use is this especially suitable when you do not want one of your apps to be available on the Internet.
-
-!!!! mDNS protocol does not allow for subdomains to be created. So `domain.local` will work, while `sub.domain.local` is not possible.
-
-`Yunomdns` service takes care of publishing your `.local` domains on your network.
-It has a configuration file, `/etc/yunohost/mdns.yml`, which allows you to choose which domains are published, and on which network interfaces.
-This file is automatically regenerated whenever you add or delete a `.local` domain.
-
-The service will always try to publish `yunohost.local`. If you have multiple YunoHost servers on your network, try `yunohost-2.local`, and so on.
-The number may change depending on which server starts first, so do not rely on it to use actual apps and create your own domains.
-
-! Unfortunately, Android devices before version 12 (released in 2021) do not seem to be listening to mDNS protocol.
-! To be able to reach `.local` domains on your Android devices, you will have to add in their DNS settings your YunoHost server's local IP address.
-
-## DNS configuration
-
-DNS (Domain Name System) is a system that allows computers from around the world to translate human-readable domain names (such as `yolo.com`) to machine-understandable adresses called IP addresses (such as `11.22.33.44`). For this translation (and other features) to work, you must carefully configure DNS records. 
-
-YunoHost can generate a recommended DNS configuration for each domain, including elements needed for mail and XMPP. The recommended DNS configuration is available in the webadmin via Domain > (the domain) > DNS configuration, or with the command `yunohost domain dns-conf the.domain.tld`.
-
-## SSL/HTTPS certificates
-
-Another important aspect of domain configuration is the SSL/HTTPS certificate. YunoHost is integrated with Let's Encrypt, so once your server is correctly reachable from anybody on the internet through the domain name, the administrator can request a Let's Encrypt certificate. See the documentation about [certificates](/certificate) for more information.
-
-## Subpaths vs. individual domains per apps
-
-In the context of YunoHost, it is quite common to have a single (or a few) domains on which several apps are installed in "subpaths", so that you end up with something like this: 
-
-```bash
-yolo.com
-     ├── /blog  : Wordpress (a blog)
-     ├── /cloud : Nextcloud (a cloud service)
-     ├── /rss   : TinyTiny RSS (a RSS reader)
-     ├── /wiki  : DokuWiki (a wiki)
-```
-
-Alternatively, you may choose to install each (or some) apps on a dedicated domain. Beyond the aesthetic, using sub-domains instead of sub-paths allows the possibility to move a service to another server more easily. Also, some applications may need an entire domain dedicated to them, for technical reasons. The disadvantage is that you have to add a new domain each time, and therefore potentially configure additional DNS records, restart the diagnostics and install a new Let's Encrypt certificate.
-
-This might look prettier for end users, but is generally considered more complicated and less efficient in the context of YunoHost, since you need to add a new domain each time. Nevertheless, some apps might need an entire domain dedicated to them, for technical reasons.
-
-If all apps from the previous example were installed on a separate domain, this would give something like this:
-
-```bash
-blog.yolo.com  : Wordpress (a blog)
-cloud.yolo.com : Nextcloud (a cloud service)
-rss.yolo.com   : TinyTiny RSS (a RSS reader)
-wiki.yolo.com  : DokuWiki (a wiki)
-```
-
-!!! Many applications integrate a functionality that allows you to change the URL of your application. This choice between subpath and subdomain can be reversed in some cases via a simple manipulation in the administration interface.

pages/01.administrate/07.specific_use_cases/12.api/admin_api.md

@@ -1,62 +0,0 @@
----
-title: Administration from the API or an external application
-template: docs
-taxonomy:
-    category: docs
-routes:
-  default: '/admin_api'
----
-
-All command line actions can also be ran from the web API. The API is available at https://your.server/yunohost/api. For now there's no documentation on the various routes... but you can get an idea by looking at the actionmap [here](https://github.com/YunoHost/yunohost/blob/dev/data/actionsmap/yunohost.yml) (in particular the `api` stuff).
-
-## Using cURL
-
-You must first retrieve a login cookie to perform the actions. Here is an example with cURL:
-
-```bash
-# Login (with admin password)
-curl -k -H "X-Requested-With: customscript" \
-        -d "password=supersecretpassword" \
-        -dump-header headers \
-        https://your.server/yunohost/api/login
-
-# GET example
-curl -k -i -H "Accept: application/json" \
-           -H "Content-Type: application/json" \
-           -L -b headers -X GET https://your.server/yunohost/api/ROUTE \
-        | grep } | python -mjson.tool
-```
-
-## Using a PHP class
-
-To simplify the remote administration of a YunoHost instance in CHATONS/Librehosters projects, API classes have been developed by users.
-
-For example, this [PHP class](https://github.com/scith/yunohost-api-php) will allow you to administer your YunoHost instance from a PHP application (website, capacity management tool...).
-
-Here is an example of PHP code to add a user to your YunoHost instance:
-
-```php 
-require("ynh_api.class.php");
-$ynh = new YNH_API("adresse IP du serveur YunoHost ou nom d’hôte", "mot de passe administrateur");
-
-if ($ynh->login()) {
-    $domains = $ynh->get("/domains");
-    $first_domain = $domains['domains'][0];
-
-    $arguments = array(
-        'username' => 'test',
-        'password' => 'yunohost', 
-        'firstname' => 'Prénom',
-        'lastname' => 'Nom',
-        'mail' => 'test@'.$first_domain,
-        'mailbox_quota' => '500M'
-    );
-
-    $user_add = $ynh->post("/users", $arguments);
-    print_r($user_add);
-
-} else {
-    print("Login to YunoHost failed.\n");
-    exit;
-}
-```

pages/01.administrate/07.specific_use_cases/specific_use_cases.fr.md

@@ -1,10 +0,0 @@
----
-title: Cas d'usage spécifiques
-template: docs
-taxonomy:
-    category: docs
-routes:
-  default: '/specific_use_cases'
----
-
-Dans les pages suivantes, vous trouverez des explications spécifiques à certains cas d'utilisation

pages/01.administrate/07.specific_use_cases/specific_use_cases.md

@@ -1,10 +0,0 @@
----
-title: Specific use cases
-template: docs
-taxonomy:
-    category: docs
-routes:
-  default: '/specific_use_cases'
----
-
-In the following pages you will find tutorials for specific use cases.

pages/01.administrate/08.troubleshooting/05.unblacklisting/blacklist_forms.md

@@ -1,27 +0,0 @@
----
-title: Unblacklisting forms
-template: docs
-taxonomy:
-    category: docs
-routes:
-  default: '/blacklist_forms'
----
-
-It could happen sometimes that your IP is blacklisted by some email provider, or anti-spam services.
-
-## Test your server
-
-* [Test sending an email](https://www.mail-tester.com)
-- [Test from an IP address](http://whatismyipaddress.com/blacklist-check)
-
-Here is some forms that could help you remove your IP address from these lists
-
-## Email providers
-
-* [Microsoft](https://support.microsoft.com/en-us/getsupport?oaspworkflow=start_1.0.0.0&wfname=capsub&productkey=edfsmsbl3&locale=en-us)
-* [GMail](https://support.google.com/mail/contact/msgdelivery)
-
-## Anti-spam services
-
-* [SpamHaus](http://www.spamhaus.org/lookup)
-* http://whatismyipaddress.com/blacklist-check

pages/01.administrate/admindoc.es.md

@@ -1,16 +0,0 @@
----
-title: Admin guide
-template: chapter
-taxonomy:
-    category: docs
-routes:
-    default: /admindoc
----
-<!--
-### Administrate
-
-# Discover self-hosting, how to install and use YunoHost
--->
-### Administrar
-
-# Descubre el auto-hospedaje, cómo instalar y usar tu YunoHost

pages/01.overview/05.self_hosting/self_hosting.it.md

@@ -17,7 +17,7 @@ Praticare il self-hosting non rende il "tuo internet" più sicuro e non fornisce
 
 - **Credi in un internet libero, aperto e decentralizzato.** In un internet centralizzato, le aziende private e i governi possono controllare, analizzare e influenzare le persone partendo da come possono interagire gli uni con gli altri, fino ad arrivare a filtrare i contenuti. YunoHost è sviluppato da una comunità che crede in un internet aperto e decentralizzato. Speriamo che anche tu la pensi allo stesso modo!
 
-- **Vuoi avere il controllo dei tuoi dati e dei servizi.** Le tue immagini, i tuoi messaggi di chat, la tua cronologia di navigazione, e le tue discussione per la scuola non hanno niente che fare con il computer di qualcun altro (a.k.a. il Cloud). Questi dati fanno parte della tua vita privata, ma anche quella della tua famiglia, dei tuoi amici, ecc. Questi dati dovrebbero essere gestiti da *te*, e non per da una qualunque azienda americana che cerca di analizzare i tuoi dati per rivendere i risultati.
+- **Vuoi avere il controllo dei tuoi dati e dei servizi.** Le tue immagini, i tuoi messaggi di chat, la tua cronologia di navigazione, e i testi che scrivi per la scuola non hanno niente che fare con il computer di qualcun altro (a.k.a. il Cloud). Questi dati fanno parte della tua vita privata, ma anche quella della tua famiglia, dei tuoi amici, ecc. Questi dati dovrebbero essere gestiti da *te*, e non per da una qualunque azienda americana che cerca di analizzare i tuoi dati per rivendere i risultati.
 
 - **Vuoi capire come funzionano i computer e Internet.** Operare sul proprio server è un buon modo per imparare i meccanismi alla base del cuore di un sistema operativo (OS) e di Internet. Dovrai probabilmente far ricorso alla linea di comando e ai meccanismi di configurazione delle risorse e i DNS.
 

pages/01.overview/overview.fr.md

@@ -0,0 +1,10 @@
+---
+title: Vue d'ensemble
+template: chapter
+taxonomy:
+    category: docs
+routes:
+    default: /overview
+---
+
+# Vue d'ensemble

pages/01.overview/overview.md

@@ -0,0 +1,10 @@
+---
+title: Overview
+template: chapter
+taxonomy:
+    category: docs
+routes:
+    default: /overview
+---
+
+# Overview

pages/02.administer/05.how_to_host_yourself/how_to_host_yourself.de.md

@@ -25,7 +25,7 @@ Ein VPN ist ein verschlüsselter Tunnel zwischen zwei Computern. In der Praxis s
 
 ### Auf einem Remote-Server (VPS oder dedizierter Server)
 
-Sie können einen virtuellen privaten Server oder eine dedizierte Maschine von [associative](https://db.ffdn.org/) oder von anderen kommerziellen "Cloud"-Anbietern mieten.
+Sie können einen virtuellen privaten Server oder eine dedizierte Maschine von [associative](https://db.ffdn.org/) oder von anderen [kommerziellen](/providers/server) "Cloud"-Anbietern mieten.
 
 - **Pros** : Ihr Server und seine Internetverbindung sind schnell;
 - **Cons** : Sie müssen ein monatliches Abonnement bezahlen und haben keine physische Kontrolle über Ihren Server.

pages/02.administer/05.how_to_host_yourself/how_to_host_yourself.es.md

@@ -1,5 +1,5 @@
 ---
-title: Elegir manera de autohospedaje
+title: Elegir manera y proveedores de autohospedaje
 template: docs
 taxonomy:
     category: docs
@@ -25,7 +25,7 @@ Una VPN es un tunel encriptado entre dos máquinas. En la práctica, permite hac
 
 ### En un servidor remoto (VPS o servidor dedicado)
 
-Puedes alquilar un servidor privado virtual (VPS) o una máquina dedicada a alojamientos [asociativos](https://db.ffdn.org/) o comerciales.
+Puedes alquilar un servidor privado virtual (VPS) o una máquina dedicada a alojamientos [asociativos](https://db.ffdn.org/) o [comerciales](/providers/server).
 
 - **Ventajas**: Tu servidor será rápido y su conexión veloz.
 - **Desventajas**: Ocasiona un gasto mensual por la máquina, y no tienes control físico.

pages/02.administer/05.how_to_host_yourself/how_to_host_yourself.fr.md

@@ -1,5 +1,5 @@
 ---
-title: Choisir son mode d'autohébergement
+title: Choisir son mode et fournisseurs d'autohébergement
 template: docs
 taxonomy:
     category: docs
@@ -25,7 +25,7 @@ Un VPN est un tunnel chiffré entre deux machines. En pratique, cela permet de f
 
 ### Sur un serveur distant (VPS ou serveur dédié)
 
-Vous pouvez louer un serveur privé virtuel ou une machine dédiée à des hébergeurs [associatifs](https://db.ffdn.org/) ou commerciaux.
+Vous pouvez louer un serveur privé virtuel ou une machine dédiée à des hébergeurs [associatifs](https://db.ffdn.org/) ou [commerciaux](/providers/server).
 
 - **Avantages** : votre serveur sera rapide et la connectivité internet sera bonne ;
 - **Inconvénients** : il vous faudra payer des frais mensuels pour la machine, et vous n'aurez pas de contrôle physique dessus.

pages/02.administer/05.how_to_host_yourself/how_to_host_yourself.it.md

@@ -1,5 +1,5 @@
 ---
-title: Scegliere il proprio self-hosting
+title: Scegliere il tuo metodo e provider de self-hosting
 template: docs
 taxonomy:
     category: docs
@@ -25,7 +25,7 @@ Una VPN è un tunnel criptato tra due macchine. In pratica permette di avere una
 
 ### Su un server distante (VPS o server dedicato)
 
-Puoi affittare un server virtuale privato o un macchina dedicata da fornitori "Cloud" come [associazioni](https://db.ffdn.org) o commerciali
+Puoi affittare un server virtuale privato o un macchina dedicata da fornitori "Cloud" come [associazioni](https://db.ffdn.org) o [commerciali](/providers/server)
 
 - **Pro**: il tuo server e la connessione saranno veloci;
 - **Contro**: dovrai pagare un canone mensile per la macchina e non avrai il controllo fisico del tuo server.

pages/02.administer/05.how_to_host_yourself/how_to_host_yourself.md

@@ -1,5 +1,5 @@
 ---
-title: How to host yourself?
+title: Choose your selfhosting method and providers
 template: docs
 taxonomy:
     category: docs
@@ -25,7 +25,7 @@ A VPN is an encrypted tunnel between two machines. In practice, it makes it "as
 
 ### On a remote server (VPS or dedicated server)
 
-You can rent a virtual private server or a dedicated machine from [associative](https://db.ffdn.org/) or commercial "Cloud" providers.
+You can rent a virtual private server or a dedicated machine from [associative](https://db.ffdn.org/) or [commercial](/providers/server) "Cloud" providers.
 
 - **Pros** : your server and its internet connectivity will be fast;
 - **Cons** : you will have to pay a monthly subscription and won't have physical control of your server.

pages/02.administer/10.install/05.images/images.fr.md

@@ -17,8 +17,9 @@ Cette page requiert que Javascript soit activé pour s'afficher correctement :s.
 
 !!! Si vous souhaitez vérifier la validité de nos images signées, vous pouvez [télécharger notre clé publique](https://forge.yunohost.org/yunohost.asc).
 
-! Les images actuelles sont basées sur Debian Buster (YunoHost v4.x) et nécessitent que vous fassiez la commande `apt update` en SSH ou ligne de commande pour continuer les mises à jour.
+! Certaines images sont encore basées sur Debian Buster (YunoHost v4.x) et nécessitent que vous fassiez la commande `apt update` en SSH ou ligne de commande pour continuer les mises à jour.
 ! Répondez Oui à l'avertissement à propos du changement de `stable` vers `oldstable`.
+! Cette opération n'est pas nécessaire pour YunoHost 11.x (images Bullseye)
 
 <div class="hardware-image">
 <div id="cards-list">

pages/02.administer/10.install/05.images/images.md

@@ -17,8 +17,9 @@ This page requires Javascript enabled to display properly :s.
 
 !!! If you wish to check the validity of our signed images, you can [download our public key](https://forge.yunohost.org/yunohost.asc).
 
-! Current images are from Debian Buster (YunoHost v4.x) and will require that you perform a manual `apt update` command in SSH or CLI to continue updating.
+! Some images are still in Debian Buster (YunoHost v4.x) and will require that you perform a manual `apt update` command in SSH or CLI to continue updating.
 ! Answer Yes to the warning about switching from `stable` to `oldstable`.
+! You don't need to do that for YunoHost 11.x (Bullseye images)
 
 <div class="hardware-image">
 <div id="cards-list">

pages/02.administer/10.install/install.fr.md

@@ -116,7 +116,7 @@ Sélectionnez le matériel sur lequel vous souhaitez installer YunoHost :
 {% elseif vps_debian or vps_ynh %}
 
 [div class="flex-child hardware{%if vps_debian %} active{% endif %}"]
-[[figure caption="VPS ou serveur dédié avec Debian 10"]![](image://debian-logo.png?height=50)[/figure]](/install/hardware:vps_debian)
+[[figure caption="VPS ou serveur dédié avec Debian 11"]![](image://debian-logo.png?height=50)[/figure]](/install/hardware:vps_debian)
 [/div]
 
 [div class="flex-child hardware{%if vps_ynh %} active{% endif %}"]
@@ -165,7 +165,7 @@ Cependant, ces images communautaires existent et sont disponibles sur Docker Hub
 {% elseif arm_unsup %}
 * Une carte ARM avec au moins 512Mo de RAM ;
 {% elseif vps_debian %}
-* Un serveur dédié ou virtuel avec Debian 10 (Buster) pré-installé <small>(avec un **kernel >= 3.12**)</small>, avec au moins 512Mo de RAM et 16Go de capacité de stockage ;
+* Un serveur dédié ou virtuel avec Debian 11 (Bullseye) pré-installé <small>(avec un **kernel >= 3.12**)</small>, avec au moins 512Mo de RAM et 16Go de capacité de stockage ;
 {% elseif vps_ynh %}
 * Un serveur dédié ou virtuel avec YunoHost pré-installé, avec au moins 512Mo de RAM et 16Go de capacité de stockage ;
 {% elseif virtualbox %}
@@ -208,7 +208,7 @@ Ci-dessous une liste de fournisseurs de VPS supportant nativement YunoHost :
 [[figure caption="Alsace Réseau Neutre - FR"]![](image://vps_ynh_arn.png?height=50)[/figure]](https://vps.arn-fai.net)
 [/div]
 [div class="flex-child"]
-[[figure caption="Association ECOWAN - FR"]![](https://cdn.ecowan.fr/charte-graphique/ecowan/logo/bleu-blanc/logo-bleu-clair.svg?height=50)[/figure]](https://www.ecowan.fr/vps-linux)
+[[figure caption="Association ECOWAN - FR"]![](image://vps_ynh_ecowan.png?height=50)[/figure]](https://www.ecowan.fr/vps-linux)
 [/div]
 [/div]
 {% endif %}
@@ -222,13 +222,15 @@ Ci-dessous une liste de fournisseurs de VPS supportant nativement YunoHost :
 {% elseif arm_unsup %}
 <a href="https://www.armbian.com/download/" target="_BLANK" type="button" class="btn btn-info col-sm-12">[fa=external-link] Télécharger l'image pour votre carte sur le site d'Armbian</a>
 
-!!! N.B.: il vous faut télécharger l'image Armbian Buster.
+!!! N.B.: il vous faut télécharger l'image Armbian Bullseye.
 {% endif %}
 
 !!! Si vous souhaitez vérifier la validité de nos images signées, vous pouvez [télécharger notre clé publique](https://forge.yunohost.org/yunohost.asc).
 
-! Les images actuelles sont basées sur Debian Buster (YunoHost v4.x) et nécessitent que vous fassiez la commande `apt update` en SSH ou ligne de commande pour continuer les mises à jour.
+{% if internetcube or arm_sup %}
+! Les images sont basées sur Debian Buster (YunoHost v4.x) et nécessitent que vous fassiez la commande `apt update` en SSH ou ligne de commande pour continuer les mises à jour.
 ! Répondez Oui à l'avertissement à propos du changement de `stable` vers `oldstable`.
+{% endif %}
 
 <div class="hardware-image">
 <div id="cards-list">

pages/02.administer/10.install/install.it.md

@@ -116,7 +116,7 @@ Seleziona l'hardware sul quale desideri installare YunoHost :
 {% elseif vps_debian or vps_ynh %}
 
 [div class="flex-child hardware{%if vps_debian %} active{% endif %}"]
-[[figure caption="VPS o server dedicato con Debian 10"]![](image://debian-logo.png?height=50)[/figure]](/install/hardware:vps_debian)
+[[figure caption="VPS o server dedicato con Debian 11"]![](image://debian-logo.png?height=50)[/figure]](/install/hardware:vps_debian)
 [/div]
 
 [div class="flex-child hardware{%if vps_ynh %} active{% endif %}"]
@@ -165,7 +165,7 @@ However, community images exist and are available on Docker Hub:
 {% elseif arm_unsup %}
 * An ARM board with at least 512MB RAM
 {% elseif vps_debian %}
-* A dedicated or virtual private server with Debian 10 (Buster) <small>(with **kernel >= 3.12**)</small> preinstalled, 512MB RAM and 16GB capacity (at least)
+* A dedicated or virtual private server with Debian 11 (Bullseye) <small>(with **kernel >= 3.12**)</small> preinstalled, 512MB RAM and 16GB capacity (at least)
 {% elseif vps_ynh %}
 * A dedicated or virtual private server with yunohost preinstalled, 512MB RAM and 16GB capacity (at least)
 {% elseif virtualbox %}
@@ -220,7 +220,7 @@ Here are some VPS providers supporting YunoHost natively :
 {% elseif arm_unsup %}
 <a href="https://www.armbian.com/download/" target="_BLANK" type="button" class="btn btn-info col-sm-12">[fa=external-link] Download the image for your board on Armbian's website</a>
 
-!!! N.B.: you should download the image Armbian Buster.
+!!! N.B.: you should download the image Armbian Bullseye.
 {% endif %}
 
 

pages/02.administer/10.install/install.md

@@ -116,7 +116,7 @@ Select the hardware on which you want install YunoHost :
 {% elseif vps_debian or vps_ynh %}
 
 [div class="flex-child hardware{%if vps_debian %} active{% endif %}"]
-[[figure caption="VPS or dedicated server with Debian 10"]![](image://debian-logo.png?height=50)[/figure]](/install/hardware:vps_debian)
+[[figure caption="VPS or dedicated server with Debian 11"]![](image://debian-logo.png?height=50)[/figure]](/install/hardware:vps_debian)
 [/div]
 
 [div class="flex-child hardware{%if vps_ynh %} active{% endif %}"]
@@ -165,7 +165,7 @@ However, community images exist and are available on Docker Hub:
 {% elseif arm_unsup %}
 * An ARM board with at least 512MB RAM
 {% elseif vps_debian %}
-* A dedicated or virtual private server with Debian 10 (Buster) <small>(with **kernel >= 3.12**)</small> preinstalled, 512MB RAM and 16GB capacity (at least)
+* A dedicated or virtual private server with Debian 11 (Bullseye) <small>(with **kernel >= 3.12**)</small> preinstalled, 512MB RAM and 16GB capacity (at least)
 {% elseif vps_ynh %}
 * A dedicated or virtual private server with yunohost preinstalled, 512MB RAM and 16GB capacity (at least)
 {% elseif virtualbox %}
@@ -220,13 +220,15 @@ Here are some VPS providers supporting YunoHost natively :
 {% elseif arm_unsup %}
 <a href="https://www.armbian.com/download/" target="_BLANK" type="button" class="btn btn-info col-sm-12">[fa=external-link] Download the image for your board on Armbian's website</a>
 
-!!! N.B.: you should download the image Armbian Buster.
+!!! N.B.: you should download the image Armbian Bullseye.
 {% endif %}
 
 !!! If you wish to check the validity of our signed images, you can [download our public key](https://forge.yunohost.org/yunohost.asc).
 
+{% if internetcube or arm_sup %}
 ! Current images are from Debian Buster (YunoHost v4.x) and will require that you perform a manual apt update command in SSH or CLI to continue updating.
 ! Answer Yes to the warning about switching from stable to oldstable.
+{% endif %}
 
 <div class="hardware-image">
 <div id="cards-list">

pages/02.administer/15.admin_guide/15.command_line/command_line.fr.md

@@ -149,14 +149,6 @@ Exemple :
 ```bash
 yunohost tools diagnosis | yunopaste
 ```
-
-### La commande `ynh-vpnclient-loadcubefile.sh`
-Cette commande n'est disponible que si vous avez l'application `VPN Client` installée. Vous pouvez vous en servir pour charger un nouveau .cube dans le cas où vous ne parvenez pas à aller sur l'interface de `VPN Client` pour le faire.
-
-```bash
-ynh-vpnclient-loadcubefile.sh -u <username> -p <password> -c <path>.cube
-```
-
 ### Quelques commandes utiles
 
 Si votre interface web d'administration indique que l'API est injoignable, essayez de démarrer `yunohost-api` :

pages/02.administer/15.admin_guide/15.command_line/command_line.md

@@ -155,6 +155,7 @@ yunohost tools diagnosis | yunopaste
 ```
 
 ### The `ynh-vpnclient-loadcubefile.sh` command
+
 This command is only available if you have the `VPN Client` application installed. You can use it to load a new .cube in case you can't get to the VPN Client interface to do so. 
 
 ```bash