Skip to content
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

enable DOH/DOQ using Let's Encrypt certs out of the box #154

Merged
merged 296 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
296 commits
Select commit Hold shift + click to select a range
b2e05f1
fix ynh_app_setting_delete key
OniriCorpe Dec 27, 2023
3718369
better comment
OniriCorpe Dec 27, 2023
0806bc5
typo & better phrasing
OniriCorpe Dec 27, 2023
a951205
fix name
OniriCorpe Dec 27, 2023
ac4a27a
bump version and add a display warning at this upgrade
OniriCorpe Dec 27, 2023
4c21a0e
Auto-update README
yunohost-bot Dec 27, 2023
8e746e8
fix ynh_replace_string
OniriCorpe Dec 27, 2023
1bf819c
Merge branch 'DoT' of https://github.com/YunoHost-Apps/adguardhome_yn…
OniriCorpe Dec 27, 2023
ac4223c
fix grep
OniriCorpe Dec 27, 2023
8734f31
add docs
OniriCorpe Dec 27, 2023
77c7ced
better phrasing
OniriCorpe Dec 27, 2023
2c8322c
if the IP is public and the user doesn't want to expose port 53, skip it
OniriCorpe Dec 27, 2023
ce7daa3
add "fc" private ipv6
OniriCorpe Dec 27, 2023
58a0d75
typo
OniriCorpe Dec 27, 2023
e622a21
small refactor
OniriCorpe Dec 27, 2023
32d9aec
add comment to is_public_ip()
OniriCorpe Dec 27, 2023
5bdc4b9
typo
OniriCorpe Dec 27, 2023
a5f4285
replace two 'for loops' in install & upgrade scripts by process_ips()
OniriCorpe Dec 27, 2023
a31a7b0
add comment
OniriCorpe Dec 27, 2023
335b5d5
add comment
OniriCorpe Dec 27, 2023
9bb37f2
process IPs and regen conf when set__open_port_53()
OniriCorpe Dec 27, 2023
06ed843
mention that public IPs should be automatically removed
OniriCorpe Dec 27, 2023
28d4679
typo
OniriCorpe Dec 27, 2023
f0b6d46
adding myself as second maintainer
OniriCorpe Dec 27, 2023
d7bfbdd
moving the python script to a function in personal helpers
OniriCorpe Dec 27, 2023
f57edf0
the python code to kepp the port 53 is now useless as it's now hardcoded
OniriCorpe Dec 27, 2023
09287bf
update IPs each time the function update_config is called
OniriCorpe Dec 27, 2023
271cd94
update IPs on restore
OniriCorpe Dec 27, 2023
a090eb7
remove irrelevant comment
OniriCorpe Dec 27, 2023
f4a305d
remove dash before IP
OniriCorpe Dec 27, 2023
5d35c03
better comments
OniriCorpe Dec 27, 2023
d4a231c
add line break
OniriCorpe Dec 27, 2023
9e24b61
refactor commands to get IPs
OniriCorpe Dec 27, 2023
c8785c3
better placment
OniriCorpe Dec 27, 2023
ac6df8b
better if
OniriCorpe Dec 27, 2023
95f8a53
Better user information about ports opening / closing
OniriCorpe Dec 27, 2023
7e74ca5
better docs
OniriCorpe Dec 27, 2023
b95d192
mopved all the code to create a dnsmask config with the network inter…
OniriCorpe Dec 27, 2023
fdc0d03
put back the comment note about echo & add comment
OniriCorpe Dec 27, 2023
8aef567
simplify "source _common.sh" path
OniriCorpe Dec 27, 2023
b913775
backup & restore AGH dnsmasq config is now irrelevant (as it's regene…
OniriCorpe Dec 27, 2023
aeab637
rename "update_config()" into more explicit "update_agh_config()"
OniriCorpe Dec 27, 2023
bb235a2
Remove the dedicated dnsmasq config for AdGuardHome
OniriCorpe Dec 27, 2023
c512e95
add progression message for system configurations removal
OniriCorpe Dec 27, 2023
a55c98a
dnsmask config removal put at the end
OniriCorpe Dec 27, 2023
5790f18
fix IP indenting
OniriCorpe Dec 27, 2023
490e207
fix ip
OniriCorpe Dec 27, 2023
6223ab7
Revert "simplify "source _common.sh" path"
OniriCorpe Dec 27, 2023
64109ee
add shellcheck config
OniriCorpe Dec 27, 2023
b74820b
shellcheck: ignore SC2005
OniriCorpe Dec 27, 2023
4b78013
debug
OniriCorpe Dec 27, 2023
a9e36a8
debug
OniriCorpe Dec 27, 2023
1d5e520
rework process_ips()
OniriCorpe Dec 27, 2023
6b3e8a8
add comment
OniriCorpe Dec 27, 2023
176f314
typo
OniriCorpe Dec 27, 2023
8dcf864
fix if
OniriCorpe Dec 28, 2023
1a86052
better test if
OniriCorpe Dec 28, 2023
2e5a033
Revert "rework process_ips()"
OniriCorpe Dec 28, 2023
22a3d33
fix IP validation for IPv6
OniriCorpe Dec 28, 2023
664b0cd
replace ynh_replace_string by ynh_write_var_in_file
OniriCorpe Dec 28, 2023
6577bd2
set "all_users" as the new [install.init_main_permission]
OniriCorpe Dec 28, 2023
be36cfb
implementing CI tests for "open_port_53" and "dns_over_https"
OniriCorpe Dec 28, 2023
1862a22
debug upgrade
OniriCorpe Dec 28, 2023
34eee20
fix the "there's no valid IP at all for this configuration" bug where…
OniriCorpe Dec 28, 2023
c4bf954
fix: processed_ips can be empty
OniriCorpe Dec 28, 2023
8c1f2e0
better docs
OniriCorpe Dec 28, 2023
8f0906e
fix
OniriCorpe Dec 28, 2023
cd382be
better message
OniriCorpe Dec 28, 2023
f4f916a
new function: get_network_interface()
OniriCorpe Dec 28, 2023
952f48f
edit the 'ip' commands because we need the IP without route too (they…
OniriCorpe Dec 28, 2023
7c5ce0d
fix
OniriCorpe Dec 28, 2023
584d0ce
trying to better handle ip processing at install
OniriCorpe Dec 28, 2023
2153dfe
fix
OniriCorpe Dec 28, 2023
fd75e1c
better phrasing
OniriCorpe Dec 28, 2023
4c6de37
fix ipv4 getting
OniriCorpe Dec 28, 2023
27f111e
rework process_ips() to effectively get multiple IP if needed
OniriCorpe Dec 28, 2023
6e86686
fix
OniriCorpe Dec 28, 2023
fd9db7c
fix
OniriCorpe Dec 28, 2023
4350238
real fix lol
OniriCorpe Dec 28, 2023
7053fbd
sigh
OniriCorpe Dec 28, 2023
75a1fb4
sigh
OniriCorpe Dec 28, 2023
2423ba0
trying a thing
OniriCorpe Dec 28, 2023
bc0a887
fix
OniriCorpe Dec 28, 2023
87c31e7
try a fix
OniriCorpe Dec 28, 2023
68cfa98
use the same IP config updating in mechanism for all scripts
OniriCorpe Dec 30, 2023
ccce10f
we no more need break lines
OniriCorpe Dec 30, 2023
815c087
put the config file at the start, before we use it
OniriCorpe Dec 30, 2023
a469538
fix
OniriCorpe Dec 30, 2023
0e4cd18
fix dnsmask config after AGH removal
OniriCorpe Dec 30, 2023
12e407f
check if the port 53 has really been released from dnsmasq
OniriCorpe Dec 30, 2023
3c60a81
use split() to split $ipvx_addr variables
OniriCorpe Dec 30, 2023
0c040d9
neh
OniriCorpe Dec 30, 2023
61e690a
am dumb lmao
OniriCorpe Dec 30, 2023
1edb675
neh2
OniriCorpe Dec 30, 2023
3e04b8a
add comments to update_agh_ip_config()
OniriCorpe Dec 30, 2023
558f620
fix password in the config file
OniriCorpe Dec 30, 2023
3887e14
no longer needed
OniriCorpe Dec 30, 2023
4c3dab8
add help text
OniriCorpe Dec 30, 2023
ff6ef61
increase ram usage to have some margin
OniriCorpe Dec 30, 2023
00936ae
debug prints no longer needed
OniriCorpe Dec 30, 2023
56b9a13
put opening/closing ports info messages in upgrade script too
OniriCorpe Dec 30, 2023
29cd1df
add 2 ynh_print_info
OniriCorpe Dec 30, 2023
dee4897
debug ip
OniriCorpe Dec 30, 2023
82d0ea3
add docs link in config panel
OniriCorpe Dec 31, 2023
a7ddbde
fix if or
OniriCorpe Dec 31, 2023
4181ed6
fixes
OniriCorpe Dec 31, 2023
799b5b2
try a fix
OniriCorpe Dec 31, 2023
1c198b3
comment
OniriCorpe Dec 31, 2023
29c6b0a
use no-op command
OniriCorpe Dec 31, 2023
5bec155
comment
OniriCorpe Dec 31, 2023
515b371
fix process_ips()
OniriCorpe Dec 31, 2023
546bcb2
fix
OniriCorpe Dec 31, 2023
a4f840f
sigh
OniriCorpe Dec 31, 2023
fa246d0
idk sigh
OniriCorpe Dec 31, 2023
5f9bdc4
debug
OniriCorpe Dec 31, 2023
06e61b0
humpft
OniriCorpe Dec 31, 2023
fab6dcc
fix and remove debug echo
OniriCorpe Dec 31, 2023
2d8e14a
we can't use IPv6 LLA for DNS
OniriCorpe Dec 31, 2023
b5a1c39
warn about IPv6 LLA
OniriCorpe Dec 31, 2023
1828efa
update the AGH config when enabling or disabling DoH
OniriCorpe Dec 31, 2023
39c1bc9
no i don't need to, i'm tired x)
OniriCorpe Dec 31, 2023
bdbd7b7
debug
OniriCorpe Dec 31, 2023
98f1689
add the missing --app to ynh_app_setting_set
OniriCorpe Dec 31, 2023
7c85868
delete --debug
OniriCorpe Dec 31, 2023
888ca46
fix unbound variables
OniriCorpe Dec 31, 2023
b38a6a4
correctly assign vars
OniriCorpe Dec 31, 2023
6b190a3
save the new setting in the AGH config file
OniriCorpe Dec 31, 2023
57fb93e
delete unneccessary yunohost firewall reload
OniriCorpe Dec 31, 2023
fe105c6
close ports while removing the package
OniriCorpe Dec 31, 2023
90c6a6c
fix ynh_write_var_in_file
OniriCorpe Dec 31, 2023
a3c8958
fix ynh_write_var_in_file
OniriCorpe Dec 31, 2023
786ec0f
remove debug ynh_print_info
OniriCorpe Jan 1, 2024
7f32cd7
add --needs_exposed_ports "53"
OniriCorpe Jan 1, 2024
4ba2351
declare needs_exposed_ports according to real user need
OniriCorpe Jan 1, 2024
06737da
declare needs_exposed_ports according to real user need
OniriCorpe Jan 1, 2024
b994dd4
rework port 53 expose
OniriCorpe Jan 1, 2024
10e581c
fix
OniriCorpe Jan 1, 2024
107a7f9
add Allowlist section
OniriCorpe Jan 1, 2024
a2f9a61
bold notes
OniriCorpe Jan 1, 2024
faba92a
add mention of the iOS "Limit IP tracking" setting
OniriCorpe Jan 1, 2024
b4e9394
fix
OniriCorpe Jan 1, 2024
2ebd81d
add a command for a ready to use list
OniriCorpe Jan 1, 2024
2d5c1ea
refactor
OniriCorpe Jan 1, 2024
389b903
del line break
OniriCorpe Jan 1, 2024
6477aab
better command
OniriCorpe Jan 1, 2024
a74b43b
explain the command
OniriCorpe Jan 1, 2024
01b97d3
simpler sed
OniriCorpe Jan 1, 2024
b704fb8
simpler tr
OniriCorpe Jan 1, 2024
dc69236
simplify command
OniriCorpe Jan 2, 2024
0c5575b
update about port 53 exposure
OniriCorpe Jan 2, 2024
fb9671f
typo
OniriCorpe Jan 2, 2024
8ebedf8
add allowlist mention in the expose port 53 section
OniriCorpe Jan 2, 2024
8fa5445
add mention of the use of the port 53 in the manifest
OniriCorpe Jan 3, 2024
c569b80
add a new password tool in the config panel
OniriCorpe Jan 3, 2024
7415cc4
add ynh_print_info
OniriCorpe Jan 3, 2024
6124db9
rework opening/closing ports
OniriCorpe Jan 3, 2024
2a57997
fix
OniriCorpe Jan 3, 2024
75c6179
fix unbound variable
OniriCorpe Jan 3, 2024
6863829
if the DNS port is not 53, make sure it is
OniriCorpe Jan 3, 2024
7facbe2
moved
OniriCorpe Jan 3, 2024
5747438
add ynh_print_info
OniriCorpe Jan 3, 2024
63dfc78
fix
OniriCorpe Jan 3, 2024
267b56b
test upgrade from past version
OniriCorpe Jan 3, 2024
d8ff177
fix
OniriCorpe Jan 3, 2024
f6f6e70
import needed settings
OniriCorpe Jan 3, 2024
14a7b86
better phrasing
OniriCorpe Jan 3, 2024
aa2b4d0
add ynh_print_info
OniriCorpe Jan 3, 2024
eb54efb
add ynh_script_progression for opening and closing port section
OniriCorpe Jan 3, 2024
5539d8b
add sub category names
OniriCorpe Jan 3, 2024
fa0931a
better placing and add ynh_script_progression
OniriCorpe Jan 3, 2024
d0e977f
better phrasing
OniriCorpe Jan 4, 2024
ddd7d35
english as default
OniriCorpe Jan 6, 2024
8934664
remove irrelevant if
OniriCorpe Jan 6, 2024
0931db0
remove DoQ port in app declaration, else diagnostics will cry because…
OniriCorpe Jan 9, 2024
c7661d7
add schema
OniriCorpe Jan 17, 2024
534027c
Merge branch 'testing' into DoT
OniriCorpe Feb 8, 2024
6778467
start after nginx
OniriCorpe Feb 12, 2024
be2627c
Merge branch 'testing' into DoT
OniriCorpe Mar 7, 2024
5f6a941
Auto-update README
yunohost-bot Mar 7, 2024
4ccbe68
DoT seems to work with this config
OniriCorpe May 12, 2024
0903f45
Auto-update READMEs
yunohost-bot May 12, 2024
707348f
Merge branch 'testing' into DoT
OniriCorpe May 12, 2024
048de5f
Auto-update READMEs
yunohost-bot May 12, 2024
a808776
fix proxy_pass port for DoT
OniriCorpe May 12, 2024
6a6a009
Merge branch 'DoT' of https://github.com/YunoHost-Apps/adguardhome_yn…
OniriCorpe May 12, 2024
f7cea97
Merge branch 'testing' into DoT
OniriCorpe May 12, 2024
9c5feb4
Auto-update READMEs
yunohost-bot May 12, 2024
0808867
add kernel system config file for DoQ
OniriCorpe May 12, 2024
3d5dd45
edit scripts to handle the kernel config file for DoQ
OniriCorpe May 12, 2024
29514b0
comment edit
OniriCorpe May 12, 2024
74da41d
update docs
OniriCorpe May 12, 2024
7088456
war that maybe the devices config will be to redo if the user already…
OniriCorpe May 12, 2024
aaf7de7
wording
OniriCorpe May 12, 2024
157e0d8
bump version
OniriCorpe May 12, 2024
40fb720
Auto-update READMEs
yunohost-bot May 12, 2024
d965a19
rename the pre upgrade warning to the proper version name
OniriCorpe May 12, 2024
e08c12d
Merge branch 'DoT' of https://github.com/YunoHost-Apps/adguardhome_yn…
OniriCorpe May 12, 2024
00ca366
oops, forgot to bump the version number here too
OniriCorpe May 12, 2024
21d71b6
wording
OniriCorpe May 12, 2024
d19c5d9
rename 'port_dns_over_http' in 'port_dns_over_tls'
OniriCorpe May 13, 2024
7f37e22
use an OR in place of an AND to be sure to open ports if needed
OniriCorpe May 13, 2024
0bd9d86
fix a if condition
OniriCorpe May 13, 2024
8d5c864
fix conditions in the downward compatibility
OniriCorpe May 13, 2024
0201425
provide directly usable DoX addresses in admin docs
OniriCorpe May 13, 2024
ea65742
show the right ports for DoT & DoQ in the admin docs
OniriCorpe May 13, 2024
33566ed
fix config file
OniriCorpe May 13, 2024
74fcbc3
use fix ports for DoT and DoQ
OniriCorpe May 14, 2024
04e9b44
comment for 'internal_https.default'
OniriCorpe May 14, 2024
a2c0764
better port fixes
OniriCorpe May 14, 2024
eb08ef2
fix key duplication
OniriCorpe May 14, 2024
27607da
adding docs for Secure DNS profile creator on Apple devices
OniriCorpe May 16, 2024
d553d05
change the AGH remote app sccreenshot from inline image to a link
OniriCorpe May 16, 2024
ac58a0f
line break
OniriCorpe May 16, 2024
20cd2ae
phrasing
OniriCorpe May 16, 2024
166b19c
typo
OniriCorpe May 16, 2024
4e5a7e2
add a mention of the "DNS-over-HTTPS or DNS-over-TLS?" help section
OniriCorpe May 16, 2024
958068b
tell where DNS profiles can be managed in the device settings
OniriCorpe May 16, 2024
02a211f
mention the new apple devices DNS tutorial in the pre-upgrade text
OniriCorpe May 16, 2024
3c6058e
can't use ClientID with DoT
OniriCorpe May 16, 2024
91898f1
fixes some typos ans sentences formulations
OniriCorpe May 16, 2024
1c95e2a
fixes some typos ans sentences formulations
OniriCorpe May 16, 2024
02b0461
reset port_https because it's not relevant
OniriCorpe May 16, 2024
b597b11
document ClientID in the 'Allowlist' section of the admin docs
OniriCorpe May 16, 2024
7d221f1
simplify the 'Secure DNS profile' tutorial
OniriCorpe May 16, 2024
89646da
typos and less implicitness
OniriCorpe May 16, 2024
1502832
better phrasing
OniriCorpe May 16, 2024
e7c6a5a
typo
OniriCorpe May 16, 2024
91d86bf
fix a dumb fileless grep...
OniriCorpe May 16, 2024
2d9d2a1
rename a setting to be more accurate
OniriCorpe May 16, 2024
c8f51af
talk about 'ClientID' in the 'Authorize some public IP addresses' sec…
OniriCorpe May 16, 2024
3647ffb
line break
OniriCorpe May 16, 2024
df1363c
add the URL with ClientID for DoH
OniriCorpe May 16, 2024
839beb9
minor docs improvements
OniriCorpe May 16, 2024
a087831
add the URL with ClientID to the DoH possible URLs
OniriCorpe May 16, 2024
df1a5cf
adding precisions to a sentence
OniriCorpe May 18, 2024
fc508c5
french translation for the config panel
OniriCorpe May 18, 2024
98baaf6
smol english docs fixes
OniriCorpe May 18, 2024
ba112fd
admin docs french translation, first part
OniriCorpe May 18, 2024
2ede972
admin docs fixes
OniriCorpe May 19, 2024
30526dd
admin docs french translation, final part
OniriCorpe May 19, 2024
7e64a2b
various smol fixes
OniriCorpe May 19, 2024
da6fdd2
update some strings and translate them
OniriCorpe May 19, 2024
e5f6048
spaces before colon in french
OniriCorpe May 19, 2024
67698a5
Add Android documentation
tituspijean May 19, 2024
fc13be8
Typos
tituspijean May 19, 2024
06b18d5
Factorize apps instructions
tituspijean May 19, 2024
bb36cf2
Dynamic URL in doc, in case app changes ID someday
tituspijean May 19, 2024
dd113cb
address the "Port 853 is already used by another process or app" error
OniriCorpe May 20, 2024
dfbc1c2
disable test upgrade from commit
OniriCorpe May 20, 2024
2d3ab2e
adding command to release DoT/DoQ ports before the upgrade
OniriCorpe May 20, 2024
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
8 changes: 7 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ about: When creating a bug report, please use the following template to provide
---

**How to post a meaningful bug report**

1. *Read this whole template first.*
2. *Determine if you are on the right place:*
- *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
- *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
- *When in doubt, post here and we will figure it out together.*
3. *Delete the italic comments as you write over them below, and remove this guide.*
---

---

### Describe the bug

Expand All @@ -26,13 +28,16 @@ about: When creating a bug report, please use the following template to provide
- If yes, please explain:
- Using, or trying to install package version/branch:
- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
- Is DNS over HTTP or DNS over QUIC activated?: *no / yes*

### Steps to reproduce

- *If you performed a command from the CLI, the command itself is enough. For example:*

```sh
sudo yunohost app install the_app
```

- *If you used the webadmin, please perform the equivalent command from the CLI first.*
- *If the error occurs in your browser, explain what you did:*
1. *Go to '...'*
Expand All @@ -47,6 +52,7 @@ about: When creating a bug report, please use the following template to provide
### Logs

*When an operation fails, YunoHost provides a simple way to share the logs.*

- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.*
- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.*

Expand Down
15 changes: 15 additions & 0 deletions .shellcheckrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# ~/.shellcheckrc

# follow source _common.sh
external-sources=true

# disable common errors with yunohost scripting:

# Not following: (error message here)
disable=SC1091

# foo appears unused. Verify it or export it.
disable=SC2034

# var is referenced but not assigned.
disable=SC2154
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
However, Dnsmasq is not disabled and will continue to function as the *localhost DNS server*.


**Shipped version:** 0.107.48~ynh2
**Shipped version:** 0.107.48~ynh3

## Screenshots

Expand Down
2 changes: 1 addition & 1 deletion README_es.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
However, Dnsmasq is not disabled and will continue to function as the *localhost DNS server*.


**Versión actual:** 0.107.48~ynh2
**Versión actual:** 0.107.48~ynh3

## Capturas

Expand Down
2 changes: 1 addition & 1 deletion README_eu.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
However, Dnsmasq is not disabled and will continue to function as the *localhost DNS server*.


**Paketatutako bertsioa:** 0.107.48~ynh2
**Paketatutako bertsioa:** 0.107.48~ynh3

## Pantaila-argazkiak

Expand Down
2 changes: 1 addition & 1 deletion README_fr.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Il fonctionne comme un serveur DNS qui redirige les domaines de pistage vers un
Cependant, Dnsmasq n'est pas désactivé et continuera à fonctionner en tant que *serveur DNS localhost*.


**Version incluse :** 0.107.48~ynh2
**Version incluse :** 0.107.48~ynh3

## Captures d’écran

Expand Down
2 changes: 1 addition & 1 deletion README_gl.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
However, Dnsmasq is not disabled and will continue to function as the *localhost DNS server*.


**Versión proporcionada:** 0.107.48~ynh2
**Versión proporcionada:** 0.107.48~ynh3

## Capturas de pantalla

Expand Down
2 changes: 1 addition & 1 deletion README_zh_Hans.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t
However, Dnsmasq is not disabled and will continue to function as the *localhost DNS server*.


**分发版本:** 0.107.48~ynh2
**分发版本:** 0.107.48~ynh3

## 截图

Expand Down
28 changes: 0 additions & 28 deletions check_process

This file was deleted.

5 changes: 5 additions & 0 deletions conf/10-adguardhome.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# This is a configuration file linked to the AdGuardHome YunoHost package

# augment the packet buffer size for DNS over QUIC to work properly
net.core.rmem_max = 2500000
net.core.wmem_max = 2500000
198 changes: 125 additions & 73 deletions conf/AdGuardHome.yaml
Original file line number Diff line number Diff line change
@@ -1,109 +1,120 @@
bind_host: 127.0.0.1
bind_port: __PORT__
beta_bind_port: 0
http:
pprof:
port: 6060
enabled: false
address: 127.0.0.1:__PORT__
session_ttl: 720h
users:
- name: __ADMIN__
password: __PASSWORD__
- name: __ADMIN__
password: __PASSWORD__
auth_attempts: 5
block_auth_min: 15
http_proxy: ""
language: ""
rlimit_nofile: 0
debug_pprof: false
web_session_ttl: 720
language: en
theme: auto
dns:
bind_hosts:
__IPV4_ADDR__
__IPV6_ADDR__
bind_hosts: []
port: 53
statistics_interval: 1
querylog_enabled: true
querylog_file_enabled: true
querylog_interval: 90
querylog_size_memory: 1000
anonymize_client_ip: false
protection_enabled: true
blocking_mode: default
blocking_ipv4: ""
blocking_ipv6: ""
blocked_response_ttl: 10
parental_block_host: family-block.dns.adguard.com
safebrowsing_block_host: standard-block.dns.adguard.com
ratelimit: 20
ratelimit_subnet_len_ipv4: 24
ratelimit_subnet_len_ipv6: 56
ratelimit_whitelist: []
refuse_any: true
upstream_dns:
- https://dns10.quad9.net/dns-query
- https://dns10.quad9.net/dns-query
- https://dns.mullvad.net/dns-query
- https://dns-unfiltered.adguard.com/dns-query
upstream_dns_file: ""
bootstrap_dns:
- 9.9.9.10
- 149.112.112.10
- 194.242.2.2
- 2620:fe::10
- 2620:fe::fe:10
all_servers: false
- 2a07:e340::2
fallback_dns: []
all_servers: true
fastest_addr: false
fastest_timeout: 1s
allowed_clients: []
disallowed_clients: []
blocked_hosts:
- version.bind
- id.server
- hostname.bind
cache_size: 4194304
cache_ttl_min: 0
cache_ttl_max: 0
- version.bind
- id.server
- hostname.bind
trusted_proxies:
- 127.0.0.0/8
- ::1/128
cache_size: 41943040
cache_ttl_min: 10800
cache_ttl_max: 86400
cache_optimistic: true
bogus_nxdomain: []
aaaa_disabled: false
enable_dnssec: false
edns_client_subnet: false
edns_client_subnet:
custom_ip: ""
enabled: false
use_custom: false
max_goroutines: 300
handle_ddr: true
ipset: []
filtering_enabled: true
filters_update_interval: 24
parental_enabled: false
safesearch_enabled: false
safebrowsing_enabled: false
safebrowsing_cache_size: 1048576
safesearch_cache_size: 1048576
parental_cache_size: 1048576
cache_time: 30
rewrites: []
blocked_services: []
local_domain_name: lan
resolve_clients: true
ipset_file: ""
bootstrap_prefer_ipv6: true
upstream_timeout: 10s
private_networks: []
use_private_ptr_resolvers: false
local_ptr_upstreams: []
use_dns64: false
dns64_prefixes: []
serve_http3: true
use_http3_upstreams: true
serve_plain_dns: true
tls:
enabled: false
server_name: ""
enabled: __DNS_OVER_HTTPS__
server_name: "__DOMAIN__"
force_https: false
port_https: 443
port_dns_over_tls: 853
port_dns_over_quic: 784
port_https: 0
port_dns_over_tls: __PORT_DNS_OVER_TLS__
port_dns_over_quic: __PORT_DNS_OVER_QUIC__
port_dnscrypt: 0
dnscrypt_config_file: ""
allow_unencrypted_doh: __DNS_OVER_HTTPS__
strict_sni_check: false
allow_unencrypted_doh: true
certificate_chain: ""
private_key: ""
certificate_path: ""
private_key_path: ""
certificate_path: "/etc/yunohost/certs/__DOMAIN__/crt.pem"
private_key_path: "/etc/yunohost/certs/__DOMAIN__/key.pem"
strict_sni_check: false
querylog:
ignored: []
interval: 24h
size_memory: 1000
enabled: true
file_enabled: true
statistics:
ignored: []
interval: 720h
enabled: true
filters:
- enabled: true
url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
name: AdGuard DNS filter
id: 1
- enabled: false
url: https://adaway.org/hosts.txt
name: AdAway Default Blocklist
id: 2
- enabled: false
url: https://www.malwaredomainlist.com/hostslist/hosts.txt
name: MalwareDomainList.com Hosts List
id: 4
- enabled: true
url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
name: AdGuard DNS filter
id: 1
- enabled: false
url: https://adaway.org/hosts.txt
name: AdAway Default Blocklist
id: 2
- enabled: false
url: https://www.malwaredomainlist.com/hostslist/hosts.txt
name: MalwareDomainList.com Hosts List
id: 3
whitelist_filters: []
user_rules: []
dhcp:
enabled: false
interface_name: ""
local_domain_name: lan
dhcpv4:
gateway_ip: ""
subnet_mask: ""
Expand All @@ -117,13 +128,54 @@ dhcp:
lease_duration: 86400
ra_slaac_only: false
ra_allow_slaac: false
clients: []
filtering:
blocking_ipv4: ""
blocking_ipv6: ""
blocked_services:
schedule:
time_zone: Local
ids: []
protection_disabled_until: null
safe_search:
enabled: false
bing: false
duckduckgo: false
google: false
pixabay: false
yandex: false
youtube: false
blocking_mode: refused
parental_block_host: family-block.dns.adguard.com
safebrowsing_block_host: standard-block.dns.adguard.com
rewrites: []
safebrowsing_cache_size: 1048576
safesearch_cache_size: 1048576
parental_cache_size: 1048576
cache_time: 30
filters_update_interval: 12
blocked_response_ttl: 10
filtering_enabled: true
parental_enabled: false
safebrowsing_enabled: true
protection_enabled: true
clients:
runtime_sources:
whois: true
arp: true
rdns: true
dhcp: true
hosts: true
persistent: []
log:
compress: false
localtime: false
file: ""
max_backups: 0
max_size: 100
max_age: 3
file: ""
verbose: false
schema_version: 10
compress: false
local_time: false
verbose: false
os:
group: "__APP__"
user: "__APP__"
rlimit_nofile: 0
schema_version: 27
Loading