-
Notifications
You must be signed in to change notification settings - Fork 331
[AGM-2402] Update AdGuard for Linux #673
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
e909b63
Update installation.md
puglieri 68b567e
Update installation.md
puglieri b693d6d
Update settings.md
puglieri cca2136
Update settings.md
puglieri c122cbe
Update docs/adguard-for-linux/installation.md
puglieri 7589d11
Update docs/adguard-for-linux/installation.md
puglieri 9ce2166
Update docs/adguard-for-linux/installation.md
puglieri f05d528
Update docs/adguard-for-linux/installation.md
puglieri 5f1d78f
Update docs/adguard-for-linux/installation.md
puglieri 220da75
Update docs/adguard-for-linux/installation.md
puglieri 97f3ad7
Update docs/adguard-for-linux/installation.md
puglieri 39e0ce4
Update docs/adguard-for-linux/installation.md
puglieri 9880321
Update settings.md
puglieri a001c28
Update installation.md
puglieri 33de84c
Merge branch 'master' into agm-2402-update-adguard-for-linux
puglieri 23a6515
Update installation.md
puglieri 6ddf86d
Update installation.md
puglieri 6060886
Update installation.md
puglieri 98d8570
fix markdown lint (remove trailing spaces)
el-termikael ccd5598
Update installation.md
puglieri 9c0be84
Update installation.md
puglieri b51cbdf
Update settings.md
puglieri 8f6ee22
Update installation.md
puglieri 943dbd6
Update settings.md
puglieri a45d073
Update installation.md
puglieri 3cc8499
Create vpn-cli-interaction.md
puglieri 289b77a
Update settings.md
puglieri 8004546
Update docs/adguard-for-linux/installation.md
puglieri 55bbe5f
Update settings.md and vpn-cli-interaction.md
puglieri 06ff882
Merge branch 'agm-2402-update-adguard-for-linux' of https://github.co…
puglieri 31e833c
Update vpn-cli-interaction.md
puglieri 18721c1
Merge branch 'master' into agm-2402-update-adguard-for-linux
el-termikael File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -5,19 +5,27 @@ sidebar_position: 2 | |||||
|
|
||||||
| ## Install AdGuard for Linux | ||||||
|
|
||||||
| To install AdGuard, enter: | ||||||
| Open the command line on your computer. On Linux, use the keyboard shortcut *Ctrl+Alt+T*. On Mac, type *Terminal* in the search field. | ||||||
|
|
||||||
| Release | ||||||
| To install AdGuard, choose the version that better suits you (release, beta, or nightly) and enter the respective command. | ||||||
|
|
||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v | ||||||
| **Release**: | ||||||
|
|
||||||
| Beta | ||||||
| ```sh | ||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v | ||||||
| ``` | ||||||
|
|
||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v | ||||||
| **Beta**: | ||||||
|
|
||||||
| Nightly | ||||||
| ```sh | ||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v | ||||||
| ``` | ||||||
|
|
||||||
| **Nightly**: | ||||||
|
|
||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v | ||||||
| ```sh | ||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v | ||||||
| ``` | ||||||
|
|
||||||
| If required, enter your admin password. | ||||||
|
|
||||||
|
|
@@ -29,44 +37,118 @@ You can verify the signature to prove it’s an official version of AdGuard by u | |||||
|
|
||||||
| ::: | ||||||
|
|
||||||
| ## Activate license | ||||||
| ## Initial setup | ||||||
|
|
||||||
| AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don't have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. | ||||||
| AdGuard for Linux requires an [AdGuard license](https://adguard.com/license.html). If you don’t have a license yet, you can log in or create an account to get a free 14-day trial. If you already have a license, log in to activate it. To do it, follow this step-by-step guide: | ||||||
|
|
||||||
| To log in or create an account, enter: | ||||||
| 1. After installation, enter: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli activate | ||||||
| ``` | ||||||
|
|
||||||
| 1. Then select the desired option: | ||||||
|
|
||||||
|  | ||||||
|
|
||||||
| 1. Once you have a license, follow the provided link to proceed with the activation: | ||||||
|
|
||||||
| To reset your license, enter: | ||||||
|  | ||||||
|
|
||||||
| 1. After activation, you can continue to work with the program: | ||||||
|
|
||||||
|  | ||||||
|
|
||||||
| 1. You can also reset your license by entering: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli reset-license | ||||||
| ``` | ||||||
|
|
||||||
| To view the license info, enter: | ||||||
| or view the license info by entering | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli license | ||||||
| ``` | ||||||
|
|
||||||
| ## Initial setup | ||||||
| 1. Now you need to set up AdGuard CLI. To run the configuration wizard, enter: | ||||||
|
|
||||||
| To get AdGuard up and running, complete the initial setup. This includes installing the AdGuard CA certificate, enabling the necessary filters, and selecting the proxy mode. | ||||||
| ```sh | ||||||
| adguard-cli configure | ||||||
| ``` | ||||||
|
|
||||||
| To run the configuration wizard, enter: | ||||||
|  | ||||||
|
|
||||||
| adguard-cli configure | ||||||
| The wizard will ask basic questions required for the initial setup. | ||||||
|
|
||||||
| 1. After that, you can start the AdGuard protection by entering | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli start | ||||||
| ``` | ||||||
|
|
||||||
|  | ||||||
|
|
||||||
| 1. You can check the protection status using: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli status | ||||||
| ``` | ||||||
|
|
||||||
| and stop it with: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli stop | ||||||
| ``` | ||||||
|
|
||||||
|  | ||||||
|
|
||||||
| 1. To check the current configuration, enter: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli config show | ||||||
| ``` | ||||||
|
|
||||||
|  | ||||||
|
|
||||||
| The path to the configuration file will also be displayed, which you can and should edit directly. It contains descriptions of all additional options. | ||||||
|
|
||||||
| As an alternative, you can use the commands: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli config get | ||||||
| ``` | ||||||
|
|
||||||
| or: | ||||||
|
|
||||||
| ```sh | ||||||
| adguard-cli config set | ||||||
| ``` | ||||||
|
|
||||||
| They are primarily intended for scripting, though. | ||||||
|
|
||||||
| For further information on the available commands, check out the section [Settings and protection management](https://adguard.com/kb/adguard-for-linux/settings/). | ||||||
|
|
||||||
| ## Uninstall AdGuard for Linux | ||||||
|
|
||||||
| To uninstall AdGuard, enter: | ||||||
|
|
||||||
| Release | ||||||
|
|
||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u | ||||||
| ```sh | ||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/release/install.sh | sh -s -- -v -u | ||||||
| ``` | ||||||
|
|
||||||
| Beta | ||||||
|
|
||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u | ||||||
| ```sh | ||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/beta/install.sh | sh -s -- -v -u | ||||||
| ``` | ||||||
|
|
||||||
| Nightly | ||||||
|
|
||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u | ||||||
| ```sh | ||||||
| curl -fsSL https://raw.githubusercontent.com/AdguardTeam/AdGuardCLI/nightly/install.sh | sh -s -- -v -u | ||||||
| ``` | ||||||
|
|
||||||
| If required, enter your admin password. | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- | ||
| title: AdGuard VPN CLI interaction | ||
| sidebar_position: 5 | ||
| --- | ||
|
|
||
| ## AdGuard VPN CLI interaction | ||
|
|
||
| Using AdGuard CLI in **automatic proxy mode** together with AdGuard VPN CLI in **tunnel mode** is impossible due to a routing loop: AdGuard VPN CLI's traffic currently can not be excluded from being transparently proxied by AdGuard CLI, and AdGuard CLI's traffic must go through the AdGuard VPN CLI's tunnel. | ||
|
|
||
| These are the two possible solutions: | ||
|
|
||
| - Switch AdGuard CLI to **manual proxy mode**. | ||
| - In this case, AdGuard VPN CLI can be used in **tunnel mode**, but apps for which ad blocking is desired must be manually configured to use the AdGuard CLI's proxy. | ||
| - Switch AdGuard VPN CLI to **SOCKS5 mode**, and configure AdGuard CLI with an outbound proxy pointing to the SOCKS5 interface of AdGuard VPN CLI. In this case, it's important to keep in mind that: | ||
| - For an app's traffic to go through the VPN tunnel it must either have its traffic transparently proxied by AdGuard CLI (which is the case for all apps by default), or manually configured to use AdGuard VPN CLI's SOCKS5 interface. | ||
| - In order to avoid a routing loop, the `skip_outbound_proxy` option must be enabled for AdGuard VPN CLI in AdGuard CLI's apps configuration section. By default, `skip_outbound_proxy` is enabled for all apps with `vpn` in their name, including AdGuard VPN CLI. |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
думаю, команды для терминала стоит выделять ``