Merge branch 'source_lyrebird' into 'main'

Fix https://gitlab.torproject.org/tpo/web/community/-/issues/350

Closes #350

See merge request tpo/web/community!388
This commit is contained in:
Gus 2024-09-09 16:46:36 +00:00
commit 93fda4418a
5 changed files with 18 additions and 16 deletions

View File

@ -36,7 +36,7 @@ $ makepkg -irs
* **DISCLAIMER:** _AUR_ packages are user produced content. Any use of the provided files is at your own risk.
For more information on installing or building `obfs4proxy` from source, please refer to its [official documentation](https://gitlab.com/yawning/obfs4/-/blob/master/README.md).
For more information on installing or building `lyrebird` from source, please refer to its [official documentation](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird#installation).
### 4. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with:

View File

@ -53,7 +53,7 @@ Please note that when you are installing the first package from the EPEL reposit
Please ensure the key matches with the one available on the [Fedora Project website](https://getfedora.org/keys/).
This will also happens when installing packages from Tor's repository for the first time - again you must ensure the key matches.
### 5. Build obfs4proxy and move it into place.
### 5. Build lyrebird (obfs4proxy) and move it into place.
Heavily outdated versions of git can make `go get` fail, so try upgrading to a more recent git version if you're running into this problem.
@ -65,10 +65,11 @@ Install the golang package and other dependencies:
Now build the binary, and move it to a proper directory:
```
export GOPATH='mktemp -d'
go get gitlab.com/yawning/obfs4.git/obfs4proxy
sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/
# chcon --reference=/usr/bin/tor /usr/local/bin/obfs4proxy
git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird
cd lyrebird
make build
sudo cp .//lyrebird /usr/local/bin/
# chcon --reference=/usr/bin/tor /usr/local/bin/lyrebird
```
### 6. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with:
@ -83,7 +84,7 @@ BridgeRelay 1
# censors may be scanning the Internet for this port.
ORPort TODO1
ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy
ServerTransportPlugin obfs4 exec /usr/local/bin/lyrebird
# Replace "TODO2" with an obfs4 port of your choice. This port must be
# externally reachable and must be different from the one specified for ORPort.

View File

@ -47,7 +47,7 @@ The package is called `obfs4` and this is all you need to install it:
# dnf install obfs4
```
For more information about installing or building `obfs4proxy` from source, please refer to its [official documentation](https://gitlab.com/yawning/obfs4/-/blob/master/README.md).
For more information about installing or building `lyrebird` from source, please refer to its [official documentation](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/).
### 5. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with:

View File

@ -17,15 +17,16 @@ Follow the instructions to enable [automatic software updates](../../guard/cento
# zypper install tor
```
### 3. Build obfs4proxy and move it into place
### 3. Build lyrebird (obfs4proxy) and move it into place
Heavily outdated versions of git can make `go get` fail, so try upgrading to a more recent git version if you're running into this problem.
Heavily outdated versions of git can make `go install` fail, so try upgrading to a more recent git version if you're running into this problem.
```
# zypper install go git
# export GOPATH='mktemp -d'
# go get gitlab.com/yawning/obfs4.git/obfs4proxy
# cp $GOPATH/bin/obfs4proxy /usr/local/bin/.
git clone https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird
cd lyrebird
make build
sudo cp .//lyrebird /usr/local/bin/
```
### 4. Edit your Tor config file, usually located at `/usr/local/etc/tor` and replace its content with:
@ -39,7 +40,7 @@ BridgeRelay 1
# censors may be scanning the Internet for this port.
ORPort TODO1
ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy
ServerTransportPlugin obfs4 exec /usr/local/bin/lyrebird
# Replace "TODO2" with an obfs4 port of your choice. This port must be
# externally reachable and must be different from the one specified for ORPort.

View File

@ -23,13 +23,13 @@ To install the `tor` package on Void Linux, considering you are already on an up
We are opting here to install and use `obfs4` as pluggable transport, so we are going to install `obfs4proxy`.
Once we can rely on an official `opbfs4proxy` package provided by the Void Linux's maintainers, this is how we install it:
Once we can rely on an official `obfs4proxy` package provided by the Void Linux's maintainers, this is how we install it:
```
# xbps-install -S obfs4proxy
```
* For more information on installing or building `obfs4proxy` from source, please refer to its [official documentation](https://gitlab.com/yawning/obfs4/-/blob/master/README.md).
* For more information on installing or building `lyrebird` from source, please refer to its [official documentation](https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird#installation).
### 4. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: