Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/books/nvchad/vale_nvchad.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ tags:

* Familiarity with NvChad 2.0 is helpful
* Ability to change files from the command line by using your favorite editor. (`vi` or your favorite)
* The *nvim-lint* plugin correctly installed in NvChad.
* The *nvim-lint* plugin is correctly installed in NvChad.

### :material-monitor-arrow-down-variant: Installation of nvim-lint

The [nvim-lint](https://github.com/mfussenegger/nvim-lint) plugin provides support for inserting ==linters== into the editor by providing code or content correction for both the syntactic and semantic parts.
The [nvim-lint](https://github.com/mfussenegger/nvim-lint) plugin provides support for inserting ==linters== into the editor by correcting code or content for both the syntactic and semantic parts.

To install the plugin, you need to edit the `custom/plugins.lua` file by adding the following block of code:

Expand All @@ -35,7 +35,7 @@ To install the plugin, you need to edit the `custom/plugins.lua` file by adding
},
```

The plugin comes with a configuration file to be placed in the `custom/configs` folder, inside it we find a table ==linters_by_ft== where you can enter the *linters* for the languages used for development.
The plugin has a configuration file to be placed in the `custom/configs` folder. Inside it we find a table ==linters_by_ft== where you can enter the *linters* for the languages used for development.

```lua title="lint.lua"
require("lint").linters_by_ft = {
Expand Down
28 changes: 14 additions & 14 deletions docs/guides/proxies/tor_relay.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@ You can also extend the configuration to make your Tor relay an exit or bridge r

Exit relays are the last hop of a Tor circuit connecting directly to websites. Bridge relays are unlisted relays that help users with internet censorship connect to Tor.

Options for the `torrc` file are in [the man page](https://2019.www.torproject.org/docs/tor-manual.html.en). Here, we will describe a basic configuration for an exit and bridge relay.
Options for the `torrc` file are in [the man page](https://2019.www.torproject.org/docs/tor-manual.html.en). Here, we describe a basic configuration for an exit and bridge relay.

### Running an exit relay

!!! warning

If you plan to run an exit relay, make sure your ISP or hosting company is comfortable with it. Abuse complaints from exit relays are very common, as it is the last node of a Tor circuit which connects directly to websites on behalf of Tor users. Many hosting companies disallow Tor exit relays for this reason.
If you plan to run an exit relay, make sure your ISP or hosting company is comfortable with it. Abuse complaints from exit relays are widespread, as it is the last node of a Tor circuit that connects directly to websites on behalf of Tor users. Many hosting companies disallow Tor exit relays for this reason.

If you are unsure your ISP allows Tor exit relays, look at the terms of service or ask your ISP. If your ISP says no, look at another ISP or hosting company, or consider a middle or bridge relay instead.
If you are unsure your ISP allows Tor exit relays, look at the terms of service or ask your ISP. If your ISP says no, look at another ISP or hosting company or consider a middle or bridge relay instead.

If you want to run an exit relay, you'll need to append the following to your `torrc`:

Expand All @@ -171,7 +171,7 @@ ExitPolicy reject *:6881-6999
ExitPolicy accept *:*
```

This exit policy blocks only a small subset of TCP ports, which allows abuse from BitTorrent and SSH which many ISPs are uncomfortable with.
This exit policy blocks only a tiny subset of TCP ports, which allows abuse from BitTorrent and SSH, with which many ISPs are uncomfortable.

If you want to use a [reduced exit policy](https://gitlab.torproject.org/legacy/trac/-/wikis/doc/ReducedExitPolicy), you can set it in the `torrc`:

Expand All @@ -190,8 +190,8 @@ ExitPolicy reject *:*

These values imply that:

* We are allowing exit traffic to TCP ports 53 (DNS), 80 (HTTP), and 443 (HTTPS) with our "ExitPolicy accept" lines
* We are disallowing exit traffic to any other TCP port with our wildcard "ExitPolicy reject" lines.
* We allow exit traffic to TCP ports 53 (DNS), 80 (HTTP), and 443 (HTTPS) with our "ExitPolicy accept" lines
* We disallow exit traffic to any other TCP port with our wildcard "ExitPolicy reject" lines

If you want an unrestrictive exit policy, by only blocking SMTP traffic, this can be set as:

Expand All @@ -204,8 +204,8 @@ ExitPolicy accpet *:*

These values imply that

* We are disallowing exit traffic to the common SMTP TCP ports of 25, 465, and 587 in our "ExitPolicy reject" lines.
* We are allow exit traffic to all other TCP ports in our wildcard "ExitPolicy accept" line.
* We disallow exit traffic to the standard SMTP TCP ports of 25, 465, and 587 in our "ExitPolicy reject" lines
* We allow exit traffic to all other TCP ports in our wildcard "ExitPolicy accept" line

We can also allow or block a range of ports as follows:

Expand All @@ -216,8 +216,8 @@ ExitPolicy reject *:993-995

These values imply that:

* We are allowing exit traffic to TCP ports 80-81.
* We are disallowing exit traffic to TCP ports 993-995, which are used for the SSL-secured variants of IMAP, IRC, and POP3.
* We allow exit traffic to TCP ports 80-81
* We disallow exit traffic to TCP ports 993-995, which are used for the SSL-secured IMAP, IRC, and POP3 variants

You can also allow exit traffic to IPv6 addresses, assuming your server has dual-stack connectivity:

Expand All @@ -227,13 +227,13 @@ IPv6Exit 1

### Running an obfs4 bridge

In many parts of the world, including China, Iran, Russia, and Turkmenistan, direct connections to Tor are blocked. In those countries, unlisted bridge relays are used by Tor clients.
Direct connections to Tor are blocked in many parts of the world, including China, Iran, Russia, and Turkmenistan. In those countries, unlisted bridge relays are used by Tor clients.

Tor operates using a system of [pluggable transports](https://support.torproject.org/glossary/pluggable-transports/), which allow Tor traffic to be masked as other protocols such as unidentifiable dummy traffic (obfs4), WebRTC (snowflake), or HTTPS connections to Microsoft services (meek).

Due to its versatility, obfs4 is the most popular pluggable transport.

To set up an obfs4 bridge, as obfs4 is not in the EPEL repos, we'll need to compile it from scratch. Lets first install the necessary packages:
To set up an obfs4 bridge, as obfs4 is not in the EPEL repos, we will need to compile it from scratch. Let us first install the necessary packages:

```bash
dnf install git golang policycoreutils-python-utils
Expand Down Expand Up @@ -268,7 +268,7 @@ These values imply that:

* We are running an obfs4 pluggable transport located at `/usr/local/bin/obfs4proxy` on our `ServerTransportPlugin` line
* `ServerTransportListenAddr` makes our pluggable transport listen on port 12345
* Our `ExtORPort` line will listen on an randomly-chosen port for connections between Tor and our pluggable transport. Normally, this line shouldn't be changed
* Our `ExtORPort` line will listen on an randomly chosen port for connections between Tor and our pluggable transport. Normally, this line should not be changed

If you want to listen on another TCP port, change "12345" with your desired TCP port.

Expand Down Expand Up @@ -328,7 +328,7 @@ WantedBy = multi-user.target

Replace the `X` suffix after `tor`/`torrc` with your desired name. The author likes to number it for simplicity, but it can be anything.

Subsequently, we will add the instance's `torrc` file in `/etc/tor/torrcX`. Be sure to give each instance a separate port and/or IP address.
Subsequently, we will add the instance's `torrc` file in `/etc/tor/torrcX`. Ensure each instance has a separate port and/or IP address.

We will also allow our chosen TCP port "12345" (or the port in `torrcX`) in SELinux and `firewalld`:

Expand Down