Merge branch 'py3-latest' into py3-internal
This commit is contained in:
canewsin
commit
91e5b65f33
3 changed files with 40 additions and 37 deletions
31
README-ru.md
31
README-ru.md
|
|
@ -61,27 +61,27 @@
|
|||
## Как вступить
|
||||
|
||||
* Скачайте ZeroBundle пакет:
|
||||
* [Microsoft Windows](https://github.com/ZeroNetX/ZeroNet-win/archive/dist/ZeroNet-win.zip)
|
||||
* [Apple macOS](https://github.com/ZeroNetX/ZeroNet-mac/archive/dist/ZeroNet-mac.zip)
|
||||
* [Linux 64-bit](https://github.com/ZeroNetX/ZeroBundle/raw/master/dist/ZeroBundle-linux64.tar.gz)
|
||||
* [Linux 32-bit](https://github.com/ZeroNetX/ZeroBundle/raw/master/dist/ZeroBundle-linux32.tar.gz)
|
||||
* [Microsoft Windows](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-win.zip)
|
||||
* [Apple macOS](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-mac.zip)
|
||||
* [Linux 64-bit](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-linux.zip)
|
||||
* [Linux 32-bit](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-linux.zip)
|
||||
* Распакуйте где угодно
|
||||
* Запустите `ZeroNet.exe` (win), `ZeroNet(.app)` (osx), `ZeroNet.sh` (linux)
|
||||
|
||||
### Linux терминал
|
||||
|
||||
* `wget https://github.com/ZeroNetX/ZeroNet-linux/archive/dist-linux64/ZeroNet-py3-linux64.tar.gz`
|
||||
* `tar xvpfz ZeroNet-py3-linux64.tar.gz`
|
||||
* `cd ZeroNet-linux-dist-linux64/`
|
||||
* `wget https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-linux.zip`
|
||||
* `unzip ZeroNet-linux.zip`
|
||||
* `cd ZeroNet-linux`
|
||||
* Запустите с помощью `./ZeroNet.sh`
|
||||
|
||||
Он загружает последнюю версию ZeroNet, затем запускает её автоматически.
|
||||
|
||||
#### Ручная установка для Debian Linux
|
||||
|
||||
* `wget https://github.com/ZeroNetX/ZeroNet/archive/py3/ZeroNet-py3.tar.gz`
|
||||
* `tar xvpfz ZeroNet-py3.tar.gz`
|
||||
* `cd ZeroNet-py3`
|
||||
* `wget https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-src.zip`
|
||||
* `unzip ZeroNet-src.zip`
|
||||
* `cd ZeroNet`
|
||||
* `sudo apt-get update`
|
||||
* `sudo apt-get install python3-pip`
|
||||
* `sudo python3 -m pip install -r requirements.txt`
|
||||
|
|
@ -123,11 +123,11 @@ article](https://wiki.archlinux.org/index.php/ZeroNet) для дальнейше
|
|||
* `vagrant up`
|
||||
* Подключитесь к VM с помощью `vagrant ssh`
|
||||
* `cd /vagrant`
|
||||
* Запустите `python2 zeronet.py --ui_ip 0.0.0.0`
|
||||
* Запустите `python3 zeronet.py --ui_ip 0.0.0.0`
|
||||
* Откройте http://127.0.0.1:43110/ в вашем браузере.
|
||||
|
||||
### [Docker](https://www.docker.com/)
|
||||
* `docker run -d -v <local_data_folder>:/root/data -p 15441:15441 -p 127.0.0.1:43110:43110 nofish/zeronet`
|
||||
* `docker run -d -v <local_data_folder>:/root/data -p 15441:15441 -p 127.0.0.1:43110:43110 canewsin/zeronet`
|
||||
* Это изображение Docker включает в себя прокси-сервер Tor, который по умолчанию отключён.
|
||||
Остерегайтесь что некоторые хостинг-провайдеры могут не позволить вам запускать Tor на своих серверах.
|
||||
Если вы хотите включить его,установите переменную среды `ENABLE_TOR` в` true` (по умолчанию: `false`) Например:
|
||||
|
|
@ -195,9 +195,10 @@ Site:13DNDk..bhC2 Successfuly published to 3 peers
|
|||
|
||||
|
||||
## Поддержите проект
|
||||
<!--TODO: Add liberapay -->
|
||||
- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX
|
||||
- Paypal: [Donate](!https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/help_zeronet/donate/#help-to-keep-zeronet-development-alive)
|
||||
- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX (Preferred)
|
||||
- LiberaPay: https://liberapay.com/PramUkesh
|
||||
- Paypal: https://paypal.me/PramUkesh
|
||||
- Others: [Donate](!https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/help_zeronet/donate/#help-to-keep-zeronet-development-alive)
|
||||
|
||||
|
||||
#### Спасибо!
|
||||
|
|
|
|||
|
|
@ -58,21 +58,21 @@
|
|||
|
||||
### Windows
|
||||
|
||||
- 下载 [ZeroNet-py3-win64.zip](https://github.com/ZeroNetX/ZeroNet-win/archive/dist-win64/ZeroNet-py3-win64.zip) (18MB)
|
||||
- 下载 [ZeroNet-win.zip](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-win.zip) (26MB)
|
||||
- 在任意位置解压缩
|
||||
- 运行 `ZeroNet.exe`
|
||||
|
||||
### macOS
|
||||
|
||||
- 下载 [ZeroNet-dist-mac.zip](https://github.com/ZeroNetX/ZeroNet-dist/archive/mac/ZeroNet-dist-mac.zip) (13.2MB)
|
||||
- 下载 [ZeroNet-mac.zip](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-mac.zip) (14MB)
|
||||
- 在任意位置解压缩
|
||||
- 运行 `ZeroNet.app`
|
||||
|
||||
### Linux (x86-64bit)
|
||||
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet-linux/archive/dist-linux64/ZeroNet-py3-linux64.tar.gz`
|
||||
- `tar xvpfz ZeroNet-py3-linux64.tar.gz`
|
||||
- `cd ZeroNet-linux-dist-linux64/`
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-linux.zip`
|
||||
- `unzip ZeroNet-linux.zip`
|
||||
- `cd ZeroNet-linux`
|
||||
- 使用以下命令启动 `./ZeroNet.sh`
|
||||
- 在浏览器打开 http://127.0.0.1:43110/ 即可访问 ZeroHello 页面
|
||||
|
||||
|
|
@ -80,9 +80,9 @@
|
|||
|
||||
### 从源代码安装
|
||||
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet/archive/py3/ZeroNet-py3.tar.gz`
|
||||
- `tar xvpfz ZeroNet-py3.tar.gz`
|
||||
- `cd ZeroNet-py3`
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-src.zip`
|
||||
- `unzip ZeroNet-src.zip`
|
||||
- `cd ZeroNet`
|
||||
- `sudo apt-get update`
|
||||
- `sudo apt-get install python3-pip`
|
||||
- `sudo python3 -m pip install -r requirements.txt`
|
||||
|
|
@ -118,9 +118,10 @@
|
|||
接下来的步骤：[ZeroNet 开发者文档](https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/site_development/getting_started/)
|
||||
|
||||
## 帮助这个项目
|
||||
|
||||
- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX
|
||||
- Paypal: [Donate](!https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/help_zeronet/donate/#help-to-keep-zeronet-development-alive)
|
||||
- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX (Preferred)
|
||||
- LiberaPay: https://liberapay.com/PramUkesh
|
||||
- Paypal: https://paypal.me/PramUkesh
|
||||
- Others: [Donate](!https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/help_zeronet/donate/#help-to-keep-zeronet-development-alive)
|
||||
|
||||
|
||||
#### 感谢您！
|
||||
|
|
|
|||
23
README.md
23
README.md
|
|
@ -64,20 +64,20 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network - https:/
|
|||
|
||||
### Windows
|
||||
|
||||
- Download [ZeroNet-py3-win64.zip](https://github.com/ZeroNetX/ZeroNet-win/archive/dist-win64/ZeroNet-py3-win64.zip) (18MB)
|
||||
- Download [ZeroNet-win.zip](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-win.zip) (26MB)
|
||||
- Unpack anywhere
|
||||
- Run `ZeroNet.exe`
|
||||
|
||||
### macOS
|
||||
|
||||
- Download [ZeroNet-dist-mac.zip](https://github.com/ZeroNetX/ZeroNet-dist/archive/mac/ZeroNet-dist-mac.zip) (13.2MB)
|
||||
- Download [ZeroNet-mac.zip](https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-mac.zip) (14MB)
|
||||
- Unpack anywhere
|
||||
- Run `ZeroNet.app`
|
||||
|
||||
### Linux (x86-64bit)
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet-linux/archive/dist-linux64/ZeroNet-py3-linux64.tar.gz`
|
||||
- `tar xvpfz ZeroNet-py3-linux64.tar.gz`
|
||||
- `cd ZeroNet-linux-dist-linux64/`
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-linux.zip`
|
||||
- `unzip ZeroNet-linux.zip`
|
||||
- `cd ZeroNet-linux`
|
||||
- Start with: `./ZeroNet.sh`
|
||||
- Open the ZeroHello landing page in your browser by navigating to: http://127.0.0.1:43110/
|
||||
|
||||
|
|
@ -102,9 +102,9 @@ There is an official image, built from source at: https://hub.docker.com/r/canew
|
|||
|
||||
### Install from source
|
||||
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet/archive/py3/ZeroNet-py3.tar.gz`
|
||||
- `tar xvpfz ZeroNet-py3.tar.gz`
|
||||
- `cd ZeroNet-py3`
|
||||
- `wget https://github.com/ZeroNetX/ZeroNet/releases/latest/download/ZeroNet-src.zip`
|
||||
- `unzip ZeroNet-src.zip`
|
||||
- `cd ZeroNet`
|
||||
- `sudo apt-get update`
|
||||
- `sudo apt-get install python3-pip`
|
||||
- `sudo python3 -m pip install -r requirements.txt`
|
||||
|
|
@ -127,9 +127,10 @@ There is an official image, built from source at: https://hub.docker.com/r/canew
|
|||
Next steps: [ZeroNet Developer Documentation](https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/site_development/getting_started/)
|
||||
|
||||
## Help keep this project alive
|
||||
<!--TODO: Add liberapay -->
|
||||
- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX
|
||||
- Paypal: [Donate](!https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/help_zeronet/donate/#help-to-keep-zeronet-development-alive)
|
||||
- Bitcoin: 1ZeroNetyV5mKY9JF1gsm82TuBXHpfdLX (Preferred)
|
||||
- LiberaPay: https://liberapay.com/PramUkesh
|
||||
- Paypal: https://paypal.me/PramUkesh
|
||||
- Others: [Donate](!https://docs.zeronet.dev/1DeveLopDZL1cHfKi8UXHh2UBEhzH6HhMp/help_zeronet/donate/#help-to-keep-zeronet-development-alive)
|
||||
|
||||
#### Thank you!
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue