From da3f5702257b55a9d0e22c6946960898ed80a6a4 Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Mon, 16 May 2022 18:34:24 +0300 Subject: [PATCH] Fix the name of ZeroTier VPN --- .../{zerotire => zerotier}/download_1.png | Bin .../{zerotire => zerotier}/download_2.png | Bin docs/assets/{zerotire => zerotier}/ios_1.png | Bin docs/assets/{zerotire => zerotier}/ios_2.png | Bin docs/assets/{zerotire => zerotier}/ios_3.png | Bin docs/assets/{zerotire => zerotier}/ios_4.png | Bin docs/assets/{zerotire => zerotier}/ios_5.png | Bin .../assets/{zerotire => zerotier}/linux_1.png | Bin .../assets/{zerotire => zerotier}/login_1.png | Bin .../assets/{zerotire => zerotier}/login_2.png | Bin .../assets/{zerotire => zerotier}/macos_1.png | Bin .../assets/{zerotire => zerotier}/macos_2.png | Bin .../{zerotire => zerotier}/network_1.png | Bin .../{zerotire => zerotier}/network_2.png | Bin .../{zerotire => zerotier}/network_3.png | Bin .../{zerotire => zerotier}/network_4.png | Bin .../{zerotire => zerotier}/network_5.png | Bin .../{zerotire => zerotier}/network_6.png | Bin docs/assets/{zerotire => zerotier}/qgc_1.png | Bin docs/assets/{zerotire => zerotier}/qgc_2.png | Bin docs/assets/{zerotire => zerotier}/qgc_3.png | Bin .../{zerotire => zerotier}/windows_1.png | Bin .../{zerotire => zerotier}/windows_2.png | Bin .../{zerotire => zerotier}/windows_3.png | Bin .../{zerotire => zerotier}/windows_4.png | Bin .../{zerotire => zerotier}/windows_5.png | Bin docs/en/4g.md | 2 +- docs/en/SUMMARY.md | 2 +- docs/en/{zerotire_vpn.md => zerotier_vpn.md} | 58 ++++++++-------- docs/ru/4g.md | 2 +- docs/ru/SUMMARY.md | 2 +- docs/ru/{zerotire_vpn.md => zerotier_vpn.md} | 62 +++++++++--------- redirects.json | 2 + 33 files changed, 66 insertions(+), 64 deletions(-) rename docs/assets/{zerotire => zerotier}/download_1.png (100%) rename docs/assets/{zerotire => zerotier}/download_2.png (100%) rename docs/assets/{zerotire => zerotier}/ios_1.png (100%) rename docs/assets/{zerotire => zerotier}/ios_2.png (100%) rename docs/assets/{zerotire => zerotier}/ios_3.png (100%) rename docs/assets/{zerotire => zerotier}/ios_4.png (100%) rename docs/assets/{zerotire => zerotier}/ios_5.png (100%) rename docs/assets/{zerotire => zerotier}/linux_1.png (100%) rename docs/assets/{zerotire => zerotier}/login_1.png (100%) rename docs/assets/{zerotire => zerotier}/login_2.png (100%) rename docs/assets/{zerotire => zerotier}/macos_1.png (100%) rename docs/assets/{zerotire => zerotier}/macos_2.png (100%) rename docs/assets/{zerotire => zerotier}/network_1.png (100%) rename docs/assets/{zerotire => zerotier}/network_2.png (100%) rename docs/assets/{zerotire => zerotier}/network_3.png (100%) rename docs/assets/{zerotire => zerotier}/network_4.png (100%) rename docs/assets/{zerotire => zerotier}/network_5.png (100%) rename docs/assets/{zerotire => zerotier}/network_6.png (100%) rename docs/assets/{zerotire => zerotier}/qgc_1.png (100%) rename docs/assets/{zerotire => zerotier}/qgc_2.png (100%) rename docs/assets/{zerotire => zerotier}/qgc_3.png (100%) rename docs/assets/{zerotire => zerotier}/windows_1.png (100%) rename docs/assets/{zerotire => zerotier}/windows_2.png (100%) rename docs/assets/{zerotire => zerotier}/windows_3.png (100%) rename docs/assets/{zerotire => zerotier}/windows_4.png (100%) rename docs/assets/{zerotire => zerotier}/windows_5.png (100%) rename docs/en/{zerotire_vpn.md => zerotier_vpn.md} (68%) rename docs/ru/{zerotire_vpn.md => zerotier_vpn.md} (75%) diff --git a/docs/assets/zerotire/download_1.png b/docs/assets/zerotier/download_1.png similarity index 100% rename from docs/assets/zerotire/download_1.png rename to docs/assets/zerotier/download_1.png diff --git a/docs/assets/zerotire/download_2.png b/docs/assets/zerotier/download_2.png similarity index 100% rename from docs/assets/zerotire/download_2.png rename to docs/assets/zerotier/download_2.png diff --git a/docs/assets/zerotire/ios_1.png b/docs/assets/zerotier/ios_1.png similarity index 100% rename from docs/assets/zerotire/ios_1.png rename to docs/assets/zerotier/ios_1.png diff --git a/docs/assets/zerotire/ios_2.png b/docs/assets/zerotier/ios_2.png similarity index 100% rename from docs/assets/zerotire/ios_2.png rename to docs/assets/zerotier/ios_2.png diff --git a/docs/assets/zerotire/ios_3.png b/docs/assets/zerotier/ios_3.png similarity index 100% rename from docs/assets/zerotire/ios_3.png rename to docs/assets/zerotier/ios_3.png diff --git a/docs/assets/zerotire/ios_4.png b/docs/assets/zerotier/ios_4.png similarity index 100% rename from docs/assets/zerotire/ios_4.png rename to docs/assets/zerotier/ios_4.png diff --git a/docs/assets/zerotire/ios_5.png b/docs/assets/zerotier/ios_5.png similarity index 100% rename from docs/assets/zerotire/ios_5.png rename to docs/assets/zerotier/ios_5.png diff --git a/docs/assets/zerotire/linux_1.png b/docs/assets/zerotier/linux_1.png similarity index 100% rename from docs/assets/zerotire/linux_1.png rename to docs/assets/zerotier/linux_1.png diff --git a/docs/assets/zerotire/login_1.png b/docs/assets/zerotier/login_1.png similarity index 100% rename from docs/assets/zerotire/login_1.png rename to docs/assets/zerotier/login_1.png diff --git a/docs/assets/zerotire/login_2.png b/docs/assets/zerotier/login_2.png similarity index 100% rename from docs/assets/zerotire/login_2.png rename to docs/assets/zerotier/login_2.png diff --git a/docs/assets/zerotire/macos_1.png b/docs/assets/zerotier/macos_1.png similarity index 100% rename from docs/assets/zerotire/macos_1.png rename to docs/assets/zerotier/macos_1.png diff --git a/docs/assets/zerotire/macos_2.png b/docs/assets/zerotier/macos_2.png similarity index 100% rename from docs/assets/zerotire/macos_2.png rename to docs/assets/zerotier/macos_2.png diff --git a/docs/assets/zerotire/network_1.png b/docs/assets/zerotier/network_1.png similarity index 100% rename from docs/assets/zerotire/network_1.png rename to docs/assets/zerotier/network_1.png diff --git a/docs/assets/zerotire/network_2.png b/docs/assets/zerotier/network_2.png similarity index 100% rename from docs/assets/zerotire/network_2.png rename to docs/assets/zerotier/network_2.png diff --git a/docs/assets/zerotire/network_3.png b/docs/assets/zerotier/network_3.png similarity index 100% rename from docs/assets/zerotire/network_3.png rename to docs/assets/zerotier/network_3.png diff --git a/docs/assets/zerotire/network_4.png b/docs/assets/zerotier/network_4.png similarity index 100% rename from docs/assets/zerotire/network_4.png rename to docs/assets/zerotier/network_4.png diff --git a/docs/assets/zerotire/network_5.png b/docs/assets/zerotier/network_5.png similarity index 100% rename from docs/assets/zerotire/network_5.png rename to docs/assets/zerotier/network_5.png diff --git a/docs/assets/zerotire/network_6.png b/docs/assets/zerotier/network_6.png similarity index 100% rename from docs/assets/zerotire/network_6.png rename to docs/assets/zerotier/network_6.png diff --git a/docs/assets/zerotire/qgc_1.png b/docs/assets/zerotier/qgc_1.png similarity index 100% rename from docs/assets/zerotire/qgc_1.png rename to docs/assets/zerotier/qgc_1.png diff --git a/docs/assets/zerotire/qgc_2.png b/docs/assets/zerotier/qgc_2.png similarity index 100% rename from docs/assets/zerotire/qgc_2.png rename to docs/assets/zerotier/qgc_2.png diff --git a/docs/assets/zerotire/qgc_3.png b/docs/assets/zerotier/qgc_3.png similarity index 100% rename from docs/assets/zerotire/qgc_3.png rename to docs/assets/zerotier/qgc_3.png diff --git a/docs/assets/zerotire/windows_1.png b/docs/assets/zerotier/windows_1.png similarity index 100% rename from docs/assets/zerotire/windows_1.png rename to docs/assets/zerotier/windows_1.png diff --git a/docs/assets/zerotire/windows_2.png b/docs/assets/zerotier/windows_2.png similarity index 100% rename from docs/assets/zerotire/windows_2.png rename to docs/assets/zerotier/windows_2.png diff --git a/docs/assets/zerotire/windows_3.png b/docs/assets/zerotier/windows_3.png similarity index 100% rename from docs/assets/zerotire/windows_3.png rename to docs/assets/zerotier/windows_3.png diff --git a/docs/assets/zerotire/windows_4.png b/docs/assets/zerotier/windows_4.png similarity index 100% rename from docs/assets/zerotire/windows_4.png rename to docs/assets/zerotier/windows_4.png diff --git a/docs/assets/zerotire/windows_5.png b/docs/assets/zerotier/windows_5.png similarity index 100% rename from docs/assets/zerotire/windows_5.png rename to docs/assets/zerotier/windows_5.png diff --git a/docs/en/4g.md b/docs/en/4g.md index 6b549bdc..e7cb8451 100644 --- a/docs/en/4g.md +++ b/docs/en/4g.md @@ -77,7 +77,7 @@ If everything is done correctly, every time the system restarts, the service cli -> **Hint** Alternatively we recommend to use the [ZeroTier](zerotire_vpn.md) VPN-service. +> **Hint** Alternatively we recommend to use the [ZeroTier](zerotier_vpn.md) VPN-service. ## Copter control via QGroundControl diff --git a/docs/en/SUMMARY.md b/docs/en/SUMMARY.md index b17906e7..f45551e9 100644 --- a/docs/en/SUMMARY.md +++ b/docs/en/SUMMARY.md @@ -65,7 +65,7 @@ * [Model files for parts](models.md) * [ROS Melodic installation](ros-install.md) * [Camera calibration](camera_calibration.md) - * [VPN ZeroTire Connection](zerotire_vpn.md) + * [VPN ZeroTier Connection](zerotier_vpn.md) * [Quadcopter control with 4G communication](4g.md) * [Clover and Jetson Nano](jetson_nano.md) * [Remote control app](rc.md) diff --git a/docs/en/zerotire_vpn.md b/docs/en/zerotier_vpn.md similarity index 68% rename from docs/en/zerotire_vpn.md rename to docs/en/zerotier_vpn.md index a99b85b8..ed88c46f 100644 --- a/docs/en/zerotire_vpn.md +++ b/docs/en/zerotier_vpn.md @@ -4,35 +4,35 @@ 1. Go to [ZeroTier](https://www.zerotier.com/) website. - + 2. Sign up on ZeroTier. - + 3. Go to your account. 4. Click on the *Create A Network*. - + 5. After that, you will see the network you created, its ID and name. Click on the network to configure it. - + 6. In the window that appears you can change the network name and connection privacy. - + 7. Scroll down to the *Members* column. It will say that there are no users on the network. - + 8. Devices connected to the network will be displayed in this column. To allow them to connect to the network, activate the *Auth?* checkbox. The connected device will automatically be given an internal IP address, which will then be used to communicate with this device.
- - + +
> **Hint** specify names for new devices, it will help you distinguish them from each other in the future. @@ -47,17 +47,17 @@ 1. Go to the ZeroTier website. - + 2. Click on the Windows icon. - + 3. Download and run the `ZeroTier One.msi` file.
- - + +
### Network connection @@ -68,11 +68,11 @@ 3. Click on the *Join Network...* to connect to the network. - + 4. In the window that appears, enter your network ID and click *Join*. - + 5. Allow using the new network. @@ -82,11 +82,11 @@ 1. Go to the ZeroTier website. - + 2. Click on the iOS icon. - + 3. Install the *ZeroTier One* app. @@ -96,23 +96,23 @@ 2. Click on *+* to add a new connection. - + 3. Confirm the privacy policy. - + 4. Enter your network ID and click *Add Network*. - + 5. Confirm adding the new VPN configuration. 6. Connect to the VPN network by sliding the network activation slider.
- - + +
## Setup on Linux (PC, Raspberry Pi) @@ -133,7 +133,7 @@ 2. Enter the command `sudo zerotier-cli join network-id`, where `network-id` is your network ID. - + 3. If the connection is successful, the corresponding message will be displayed in the console. @@ -143,11 +143,11 @@ 1. Go to the ZeroTier website. - + 2. Click on the macOS icon. - + 3. Download and run `ZeroTier One.pkg` file. @@ -161,23 +161,23 @@ 3. In the window that appears, click on *Join Network...*. - + 4. In the *Enter Network ID* field, enter your network ID. - + ## Connecting to the copter 1. Make sure that ZeroTier is working and connected to the network on the drone and control device. To do this, make sure that these have an *Online* status. - + 2. Make sure that all devices have local IP addresses - *Managed IPs*. 3. Open GQC and in the *Comm Links* tab add a TCP connection specifying the IP of the drone. Read more about remote connection [here](gcs_bridge.md).
- - + +
diff --git a/docs/ru/4g.md b/docs/ru/4g.md index c565cf65..fdda9440 100644 --- a/docs/ru/4g.md +++ b/docs/ru/4g.md @@ -77,7 +77,7 @@ sudo systemctl enable openvpn-client@config-name -> **Hint** В качестве удобной альтернативы вы можете воспользоваться VPN-сервисом [ZeroTier](zerotire_vpn.md). +> **Hint** В качестве удобной альтернативы вы можете воспользоваться VPN-сервисом [ZeroTier](zerotier_vpn.md). ## Управление коптером через QGroundControl diff --git a/docs/ru/SUMMARY.md b/docs/ru/SUMMARY.md index 75a551f6..127d16da 100644 --- a/docs/ru/SUMMARY.md +++ b/docs/ru/SUMMARY.md @@ -69,7 +69,7 @@ * [Docker-контейнер с симулятором](sitl_docker.md) * [Установка ROS Melodic](ros-install.md) * [Калибровка камеры](camera_calibration.md) - * [Подключение к VPN ZeroTire](zerotire_vpn.md) + * [Подключение к VPN ZeroTier](zerotier_vpn.md) * [Подключение к VPN Hamachi](hamachi_vpn.md) * [Управление мультикоптером при помощи 4G связи](4g.md) * [Пакеты Клевера на Jetson Nano](jetson_nano.md) diff --git a/docs/ru/zerotire_vpn.md b/docs/ru/zerotier_vpn.md similarity index 75% rename from docs/ru/zerotire_vpn.md rename to docs/ru/zerotier_vpn.md index 9520a4b0..6057a488 100644 --- a/docs/ru/zerotire_vpn.md +++ b/docs/ru/zerotier_vpn.md @@ -1,38 +1,38 @@ -# Создание виртуальной сети ZeroTire и подключение к ней +# Создание виртуальной сети ZeroTier и подключение к ней ## Создание и настройка сети ZeroTier 1. Зайдите на сайт [ZeroTier](https://www.zerotier.com/). - + 2. Зарегистрируйтесь в ZeroTier. - + 3. Зайдите в свой аккаунт. 4. Нажмите кнопку *Create A Network*. - + 5. После этого вы увидите созданную вами сеть, ее ID и название. Для настройки сети нажмите на нее. - + 6. В открывшемся окне можно изменить имя сети и приватность подключения. - + 7. Пролистайте ниже, до графы *Members*. В ней будет написано о том, что в сети нету пользователей. - + 8. Устройства подключенные к сети будут отображаться в данной графе, для того, чтобы позволить им подключиться к сети, активируйте чекбокс *Auth?*. При этом, подключенному устройству автоматически выдастся внутренний IP адрес, в дальнейшем он будет использоваться для связи с данным устройством.
- - + +
> **Hint** Указывайте имена для новых устройств, этом поможет вам в дальнейшем отличать их друг от друга. @@ -47,17 +47,17 @@ 1. Перейдите на сайт ZeroTier. - + 2. Нажмите на иконку Windows. - + 3. Скачайте и запустите файл `ZeroTier One.msi`.
- - + +
### Подключение к сети @@ -68,15 +68,15 @@ 3. Нажмите на кнопку *Join Network...* для подключения к сети. - + 4. В появившемся окне введите ID вашей сети и нажмите кнопку *Join*. - + 5. Разрешите использование новой сети. - + ## Настройка на iOS @@ -84,11 +84,11 @@ 1. Перейдите на сайт ZeroTier. - + 2. Нажмите на иконку iOS. - + 3. Установите приложение *ZeroTier One*. @@ -98,23 +98,23 @@ 2. Нажмите на *+* для добавления нового подключения. - + 3. Подтвердите политику конфиденциальности. - + 4. Введите ID вашей сети и нажмите кнопку *Add Network*. - + 5. Подтвердите добавление новой конфигурации VPN. 6. Подключитесь к VPN сети, сдвинув ползунок активации сети.
- - + +
## Настройка на Linux (PC, Raspberry Pi) @@ -135,7 +135,7 @@ 2. Введите команду `sudo zerotier-cli join network-id`, где `network-id` это ID вашей сети. - + 3. При успешном подключении, в консоль будет выведено соответствующее сообщение. @@ -145,11 +145,11 @@ 1. Перейдите на сайт ZeroTier. - + 2. Нажмите на иконку macOS. - + 3. Скачайте и запустите файл `ZeroTier One.pkg`. @@ -163,23 +163,23 @@ 3. В открывшемся окне нажмите *Join Network...*. - + 4. В поле *Enter Network ID* введите ID вашей сети. - + ## Подключение к коптеру 1. Убедитесь, что ZeroTier работает и имеет соединение с сетью на дроне и управляющем устройстве. Для этого убедитесь, что интересующие вас устройства имеют статус *Online*. - + 2. Убедитесь, что у всех устройств есть локальные IP адреса - *Managed IPs*. 3. Откройте GQC и во вкладке *Comm Links* добавьте TCP подключение, указав IP дрона. Подробнее про удаленное подключение читайте [тут](gcs_bridge.md).
- - + +
diff --git a/redirects.json b/redirects.json index e8b41013..ea31600a 100644 --- a/redirects.json +++ b/redirects.json @@ -69,5 +69,7 @@ { "from": "en/microsd_images.html", "to": "image.html" }, { "from": "ru/px4_parameters.html", "to": "parameters.html" }, { "from": "en/px4_parameters.html", "to": "parameters.html" } + { "from": "ru/zerotire_vpn.html", "to": "zerotier_vpn.html" }, + { "from": "en/zerotire_vpn.html", "to": "zerotier_vpn.html" } ] }