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

Symbolic links to config YAML are replaced by a copy of the real file by AGH after startup #6717

Open
4 tasks done
knaggsy2000 opened this issue Feb 9, 2024 · 38 comments
Open
4 tasks done

Comments

@knaggsy2000
Copy link

Prerequisites

Platform (OS and CPU architecture)

FreeBSD, ARM64

Installation

GitHub releases or script from README

Setup

On one machine

AdGuard Home version

v0.107.44

Action

cd /opt/AdGuardHome
ln -s AdGuardHome.yaml.mytestconfig AdGuardHome.yaml

All while the service is stopped.

Expected result

I expect to see the symbolic link honoured and not messed around with.

Actual result

AGH after startup, removes the symbolic link and replaces it with a copy of the actual file.

This is not normal behaviour for a application.

Additional information and/or screenshots

As currently testing versions of AGH with a previously mentioned issue, noticed this strange behaviour.

@piyushgarg
Copy link

This is a regression in recent builds. It was working earlier as expected.

@knaggsy2000
Copy link
Author

So when can I expect it to work correctly then?

@ainar-g
Copy link
Contributor

ainar-g commented Feb 15, 2024

@knaggsy2000, I cannot reproduce this. Is your AGH installed as a service? If so, did you use AdGuardHome -s install?

@ainar-g ainar-g added the waiting for data Waiting for users to provide more data. label Feb 15, 2024
@knaggsy2000
Copy link
Author

@ainar-g Yes, it was installed as a service by the AGH script.

Also noticed something that the script needed the sudo package to be installed but it shouldn't need it (as installed by root) - should I raise this as bug?

Just re-tested with v0.107.44 on a Raspberry Pi 3 running FreeBSD 14.0-RELEASE-p3: -

# pwd
/opt/AdGuardHome

# ll
total 29168
-rwxr-xr-x 1 root wheel 29622272 Feb 8 23:34 AdGuardHome*
-rw-rw-rw- 1 root wheel 587 Feb 8 23:34 AdGuardHome.sig
lrwxr-xr-x 1 root wheel 27 Feb 15 23:15 AdGuardHome.yaml@ -> AdGuardHome.yaml.ipsdefined
-rw-r--r-- 1 root wheel 12236 Feb 8 23:43 AdGuardHome.yaml.all
-rw-r--r-- 1 root wheel 12344 Feb 8 23:41 AdGuardHome.yaml.ipsdefined
-rw-r--r-- 1 root wheel 106840 Feb 8 23:34 CHANGELOG.md
-rw-r--r-- 1 root wheel 35149 Feb 8 23:34 LICENSE.txt
-rw-r--r-- 1 root wheel 22187 Feb 8 23:34 README.md
drwxr-xr-x 2 root wheel 512 Feb 8 23:34 agh-backup/
drwxr-xr-x 3 root wheel 512 Feb 12 09:20 data/

# /opt/AdGuardHome/AdGuardHome -s start
2024/02/15 23:16:15 [info] AdGuard Home, version v0.107.44
2024/02/15 23:16:15 [info] service: control action: start
2024/02/15 23:16:15 [info] service: action start has been done successfully on freebsd

# ll
total 29184
-rwxr-xr-x 1 root wheel 29622272 Feb 8 23:34 AdGuardHome*
-rw-rw-rw- 1 root wheel 587 Feb 8 23:34 AdGuardHome.sig
-rw-r--r-- 1 root wheel 12344 Feb 15 23:16 AdGuardHome.yaml
-rw-r--r-- 1 root wheel 12236 Feb 8 23:43 AdGuardHome.yaml.all
-rw-r--r-- 1 root wheel 12344 Feb 8 23:41 AdGuardHome.yaml.ipsdefined
-rw-r--r-- 1 root wheel 106840 Feb 8 23:34 CHANGELOG.md
-rw-r--r-- 1 root wheel 35149 Feb 8 23:34 LICENSE.txt
-rw-r--r-- 1 root wheel 22187 Feb 8 23:34 README.md
drwxr-xr-x 2 root wheel 512 Feb 8 23:34 agh-backup/
drwxr-xr-x 3 root wheel 512 Feb 12 09:20 data/

Yep, the symbolic link is getting removed by the AGH service and replaced with a copy of the actual file.

@knaggsy2000
Copy link
Author

@piyushgarg Can you provide any additional info?

@ainar-g
Copy link
Contributor

ainar-g commented Feb 16, 2024

@knaggsy2000, can you enable verbose logs for your AGH service? That should shed light on what's going on.

@piyushgarg
Copy link

piyushgarg commented Feb 18, 2024

@knaggsy2000 I might be wrong, it is deleting the link and then creating a new file.

2024/02/18 22:57:32.482699 1518#1 [info] AdGuard Home, version v0.107.44
2024/02/18 22:57:32.482821 1518#1 [debug] current working directory is /opt/AdGuardHome
2024/02/18 22:57:32.482949 1518#1 [debug] reading config file: /home/pi/.config/agh/AdGuardHome.yaml
2024/02/18 22:57:32.485580 1518#1 [debug] got schema version 28
.....
2024/02/18 22:57:32.492988 1518#38 [debug] clients: removed 0 client aliases
2024/02/18 22:57:32.493099 1518#38 [debug] clients: adding client info 127.0.0.1 -> "etc/hosts" "localhost" [1]
2024/02/18 22:57:32.493149 1518#38 [debug] clients: adding client info ::1 -> "etc/hosts" "localhost" [2]
2024/02/18 22:57:32.493188 1518#38 [debug] clients: adding client info 127.0.1.1 -> "etc/hosts" "piyush.localdomain" [3]
2024/02/18 22:57:32.493215 1518#38 [debug] clients: added 3 client aliases from system hosts file
2024/02/18 22:57:32.493342 1518#1 [debug] writing config file "/home/pi/.config/agh/AdGuardHome.yaml"
2024/02/18 22:57:32.500058 1518#1 [info] Initializing auth module: /opt/AdGuardHome/data/sessions.db

@knaggsy2000
Copy link
Author

@piyushgarg Exactly, AGH is certainly messing with the symbolic link.

@knaggsy2000
Copy link
Author

knaggsy2000 commented Feb 18, 2024

@ainar-g Yes, and see the same as @piyushgarg - AGH is saying it's "writing config file": -

2024/02/18 23:09:53.880773 58531#1 [info] AdGuard Home, version v0.107.44
2024/02/18 23:09:53.885112 58531#1 [debug] current working directory is /opt/AdGuardHome
2024/02/18 23:09:53.885440 58531#1 [debug] reading config file: /opt/AdGuardHome/AdGuardHome.yaml
2024/02/18 23:09:53.906303 58531#1 [debug] got schema version 28
2024/02/18 23:09:53.918713 58531#1 [info] tls: using default ciphers
2024/02/18 23:09:53.919371 58531#1 [debug] hosts container: starting
2024/02/18 23:09:53.919635 58531#1 [debug] hosts container: refreshing
2024/02/18 23:09:53.923088 58531#1 [debug] hosts container: sending upd
2024/02/18 23:09:53.935517 58531#1 [debug] filtering: initialized 110 services
2024/02/18 23:09:53.943862 58531#1 [info] safesearch default: disabled
2024/02/18 23:09:53.948192 58531#1 [debug] dhcpd: warning: creating dhcpv4 srv: dhcpv4: invalid IP is not an IPv4 address
2024/02/18 23:09:53.950674 58531#39 [debug] clients: removed 0 client aliases
2024/02/18 23:09:53.954942 58531#39 [debug] clients: adding client info ::1 -> "etc/hosts" "localhost" [1]
2024/02/18 23:09:53.955209 58531#39 [debug] clients: adding client info 127.0.0.1 -> "etc/hosts" "localhost" [2]
2024/02/18 23:09:53.955359 58531#39 [debug] clients: added 2 client aliases from system hosts file
2024/02/18 23:09:53.955704 58531#1 [debug] writing config file "/opt/AdGuardHome/AdGuardHome.yaml"

I can understand why you would re-write the setting file (to ensure it's updated) but removing the symbolic link - that's not right. But at the same time, it is easier to simply remove the "old" file and replace it with the "new" one, done this myself. But you need to check if it's an symbolic link and actually resolve where that link goes.

@ainar-g ainar-g self-assigned this Feb 21, 2024
@ainar-g ainar-g added the needs investigation Needs to be reproduced reliably. label Feb 21, 2024
@ainar-g
Copy link
Contributor

ainar-g commented Feb 21, 2024

As mentioned, this isn't what's supposed to happen, so you don't need to convince anyone, heh. Thanks for the logs, we'll try to investigate, what could be happening here.

adguard pushed a commit that referenced this issue Feb 21, 2024
Updates #6717.

Squashed commit of the following:

commit 05a7e18
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 21 16:44:00 2024 +0300

    home: imp docs, logs
@ainar-g
Copy link
Contributor

ainar-g commented Feb 21, 2024

@knaggsy2000, we weren't able to reproduce that on any of our configurations, so we've pushed a change that adds more debug logs to the configuration-file management methods. Can you please check out the latest builds on the Edge channels and collect the verbose logs? You can also send them to devteam@adguard.com with subject “AdGuard Home Issue 6717”.

@knaggsy2000
Copy link
Author

@ainar-g Which OS'es/hardware did you test that with?

Now guessing how to do that, so I'll uninstall current version of my test PI: -

# fetch -o - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v -u

So install edge version: -

# fetch -o - https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v -c edge
starting AdGuard Home installation script
channel: edge
operating system: freebsd
cpu type: arm64
AdGuard Home will be installed into /opt/AdGuardHome
checking tar
script is executed with root privileges
no need to uninstall
downloading package from https://static.adtidy.org/adguardhome/edge/AdGuardHome_freebsd_arm64.tar.gz -> AdGuardHome_freebsd_arm64.tar.gz
AdGuardHome_freebsd_arm64.tar.gz 9447 kB 7005 kBps 01s
successfully downloaded AdGuardHome_freebsd_arm64.tar.gz
unpacking package from AdGuardHome_freebsd_arm64.tar.gz into /opt
successfully unpacked, contents:
total 29004
-rwxrwxrwx 1 root wheel 29491200 Feb 21 14:12 AdGuardHome
-rw-rw-rw- 1 root wheel 587 Feb 21 14:12 AdGuardHome.sig
-rw-r--r-- 1 root wheel 108355 Feb 21 14:12 CHANGELOG.md
-rw-r--r-- 1 root wheel 35149 Feb 21 14:12 LICENSE.txt
-rw-r--r-- 1 root wheel 22300 Feb 21 14:12 README.md
2024/02/21 23:50:37 [info] AdGuard Home, version v0.108.0-a.848+9276afd7
2024/02/21 23:50:37 [info] service: control action: install
2024/02/21 23:50:37 [fatal] service: executing action "install": Failed to install AdGuard Home service: Init already exists: /usr/local/etc/rc.d/AdGuardHome
installation failed, removing /opt/AdGuardHome
cannot install AdGuardHome as a service

Hmmm, the uninstall script doesn't remove the init.d script - so had to remove that myself...

# rm /usr/local/etc/rc.d/AdGuardHome

I consider that a bug which needs to be addressed too - want me to raise that as a new issue?

Anyway, ran the install command again and now get this: -

starting AdGuard Home installation script
channel: edge
operating system: freebsd
cpu type: arm64
AdGuard Home will be installed into /opt/AdGuardHome
checking tar
script is executed with root privileges
no need to uninstall
downloading package from https://static.adtidy.org/adguardhome/edge/AdGuardHome_freebsd_arm64.tar.gz -> AdGuardHome_freebsd_arm64.tar.gz
AdGuardHome_freebsd_arm64.tar.gz 9447 kB 7539 kBps 01s
successfully downloaded AdGuardHome_freebsd_arm64.tar.gz
unpacking package from AdGuardHome_freebsd_arm64.tar.gz into /opt
successfully unpacked, contents:
total 29004
-rwxrwxrwx 1 root wheel 29491200 Feb 21 14:12 AdGuardHome
-rw-rw-rw- 1 root wheel 587 Feb 21 14:12 AdGuardHome.sig
-rw-r--r-- 1 root wheel 108355 Feb 21 14:12 CHANGELOG.md
-rw-r--r-- 1 root wheel 35149 Feb 21 14:12 LICENSE.txt
-rw-r--r-- 1 root wheel 22300 Feb 21 14:12 README.md
2024/02/21 23:51:34 [info] AdGuard Home, version v0.108.0-a.848+9276afd7
2024/02/21 23:51:34 [info] service: control action: install
2024/02/21 23:51:34 [info] service: started
2024/02/21 23:51:34 [info] Almost ready!
AdGuard Home is successfully installed and will automatically start on boot.
There are a few more things that must be configured before you can use it.
Click on the link below and follow the Installation Wizard steps to finish setup.
AdGuard Home is now available at the following addresses:
[SNIP!]
2024/02/21 23:51:34 [info] service: action install has been done successfully on freebsd
AdGuard Home is now installed and running
you can control the service status with the following commands:
sudo /opt/AdGuardHome/AdGuardHome -s start|stop|restart|status|install|uninstall

And that command last stated needs to change too. As for the installer to work you have to install the sudo pkg, but it's NOT actually needed for anything. I use "doas" instead of "sudo" as much lighter (especially in terms of code) and secure - please look into that too. Or would you prefer I raise another issue for that?

Also noticed that the uninstall script just wipes out /opt/AdGuardHome directory without any regard to any custom files/folders (as I see my test YAML file has been wiped out as well as the collected data). That is NOT good, especially on a FreeBSD system - as that's not good practice. Packages or ports, have to specifically define the files that they install so they can be removed safely, so any custom files/etc will be left behind - even the checksums get checked as to not remove any customised configs.

Going to save this comment now as it's getting long. Going to be more after this...

@knaggsy2000
Copy link
Author

knaggsy2000 commented Feb 22, 2024

@ainar-g

As the uninstall wiped my custom files (which is wrong), need to set them up again...

# /opt/AdGuardHome/AdGuardHome -s stop

Then copied the YAML config to /opt/AdGuardHome/AdGuardHome.yaml and started the service again: -

# /opt/AdGuardHome/AdGuardHome -s start
2024/02/22 00:31:18 [info] AdGuard Home, version v0.108.0-a.848+9276afd7
2024/02/22 00:31:18 [info] service: control action: start
2024/02/22 00:31:18 [info] service: action start has been done successfully on freebsd

Checked the web interface and it's running, that's good - just more annoyed all of my stats have been wiped out :/

Using "drill" is returning DNS requests at least on the VLAN interface. Okay then, lets first test that symbolic link issue...

# ll
total 29024
-rwxrwxrwx 1 root wheel 29491200 Feb 21 14:12 AdGuardHome*
-rw-rw-rw- 1 root wheel 587 Feb 21 14:12 AdGuardHome.sig
lrwxr-xr-x 1 root wheel 20 Feb 22 00:41 AdGuardHome.yaml@ -> AdGuardHome.yaml.ips
-rw-r--r-- 1 root wheel 12400 Feb 22 00:31 AdGuardHome.yaml.ips

As you can see, I've just moved it over to a symbolic link.

Upon starting the service, get this in the log: -

2024/02/22 00:43:27.013100 54878#1 [info] AdGuard Home, version v0.108.0-a.848+9276afd7
2024/02/22 00:43:27.013718 54878#1 [debug] current working directory is /opt/AdGuardHome
2024/02/22 00:43:27.014191 54878#1 [debug] evaluating config path: lstat AdGuardHome.yaml: no such file or directory; using "AdGuardHome.yaml"
2024/02/22 00:43:27.014440 54878#1 [debug] reading config file "/opt/AdGuardHome/AdGuardHome.yaml"
2024/02/22 00:43:27.027772 54878#1 [debug] got schema version 28
2024/02/22 00:43:27.040340 54878#1 [info] tls: using default ciphers
2024/02/22 00:43:27.040982 54878#1 [debug] hosts container: starting
2024/02/22 00:43:27.041238 54878#1 [debug] hosts container: refreshing
2024/02/22 00:43:27.042163 54878#1 [debug] hosts container: sending upd
2024/02/22 00:43:27.061195 54878#1 [debug] filtering: initialized 111 services
2024/02/22 00:43:27.061810 54878#1 [info] safesearch default: disabled
2024/02/22 00:43:27.062242 54878#1 [debug] dhcpd: warning: creating dhcpv4 srv: dhcpv4: invalid IP is not an IPv4 address
2024/02/22 00:43:27.062788 54878#1 [debug] evaluating config path: lstat AdGuardHome.yaml: no such file or directory; using "AdGuardHome.yaml"
2024/02/22 00:43:27.062866 54878#13 [debug] clients: removed 0 client aliases
2024/02/22 00:43:27.062983 54878#1 [debug] using config path "/opt/AdGuardHome/AdGuardHome.yaml" for updater
2024/02/22 00:43:27.063196 54878#13 [debug] clients: adding client info ::1 -> "etc/hosts" "localhost" [1]
2024/02/22 00:43:27.063486 54878#13 [debug] clients: adding client info 127.0.0.1 -> "etc/hosts" "localhost" [2]
2024/02/22 00:43:27.063643 54878#13 [debug] clients: added 2 client aliases from system hosts file
2024/02/22 00:43:27.064004 54878#1 [debug] evaluating config path: lstat AdGuardHome.yaml: no such file or directory; using "AdGuardHome.yaml"
2024/02/22 00:43:27.064231 54878#1 [debug] writing config file "/opt/AdGuardHome/AdGuardHome.yaml"

What are those "lstat" messages? Is that the issue? As "lstat" is NOT a FreeBSD executable. I don't even know what that would do.

Running a "ll" now shows: -

-rwxrwxrwx 1 root wheel 29491200 Feb 21 14:12 AdGuardHome*
-rw-rw-rw- 1 root wheel 587 Feb 21 14:12 AdGuardHome.sig
-rw-r--r-- 1 root wheel 12400 Feb 22 00:43 AdGuardHome.yaml
-rw-r--r-- 1 root wheel 12400 Feb 22 00:31 AdGuardHome.yaml.ips

Symbolic link still messed around.

Numerous issues mentioned now.

@ainar-g
Copy link
Contributor

ainar-g commented Feb 22, 2024

Thanks for trying this out.

Regarding the script issues, hidden as off-topic

Hmmm, the uninstall script doesn't remove the init.d script - so had to remove that myself...

# rm /usr/local/etc/rc.d/AdGuardHome

I consider that a bug which needs to be addressed too - want me to raise that as a new issue?

Yes, please, file a separate one about this.

I use "doas" instead of "sudo" as much lighter (especially in terms of code) and secure - please look into that too. Or would you prefer I raise another issue for that?

Same. We use doas by default for OpenBSD, as you can see in the script itself, because it's just a convenience script that typically just assumes defaults, but I guess we could add a switch to override the default choice.

What are those "lstat" messages? Is that the issue? As "lstat" is NOT a FreeBSD executable. I don't even know what that would do.

It's not an excutable, but a syscall, see man 2 lstat. This error is returned when AGH evaluates the symlink to read/write the actual file. For some reason, on your system it gets an ENOENT. It could be some kind of wd weirdness, but it says that the working directory is /opt/AdGuardHome right above, so this is quite weird.

The two tests that should shed more light on the situation are:

  1. Trying a symlink to an absolute path:

    ln -s "${PWD}/AdGuardHome.yaml.ips" AdGuardHome.yaml
    
  2. Modifying the rc script to explicitly set the path to the symlink with -c ./AdGuardHome.yaml (see AdGuardHome --help as well as our Wiki article).

    (By the way, you can use the flag if the only reason for using a symlink is to use a different name for a config file.)

  3. It's more of a question, really, but why are you using a soft link in the first place? If the actual configuration file is in the same directory a simple hard link should work just as well.

@knaggsy2000
Copy link
Author

knaggsy2000 commented Feb 22, 2024

@ainar-g Separate issue raised about the init.d not being removed #6761

But what about the requirement of having to install sudo which it doesn't even use? Shall I raise that? Edit: I have - #6762

@knaggsy2000
Copy link
Author

@ainar-g Ah, so "lstat" is a kernel call - I did think about that.

You mention that using "doas" is default for OpenBSD, so why doesn't the installer expect that? Given what I saw before.

@knaggsy2000
Copy link
Author

Thanks for trying this out.
Regarding the script issues, hidden as off-topic

Hmmm, the uninstall script doesn't remove the init.d script - so had to remove that myself...
# rm /usr/local/etc/rc.d/AdGuardHome
I consider that a bug which needs to be addressed too - want me to raise that as a new issue?

Yes, please, file a separate one about this.

I use "doas" instead of "sudo" as much lighter (especially in terms of code) and secure - please look into that too. Or would you prefer I raise another issue for that?

Same. We use doas by default for OpenBSD, as you can see in the script itself, because it's just a convenience script that typically just assumes defaults, but I guess we could add a switch to override the default choice.

What are those "lstat" messages? Is that the issue? As "lstat" is NOT a FreeBSD executable. I don't even know what that would do.

It's not an excutable, but a syscall, see man 2 lstat. This error is returned when AGH evaluates the symlink to read/write the actual file. For some reason, on your system it gets an ENOENT. It could be some kind of wd weirdness, but it says that the working directory is /opt/AdGuardHome right above, so this is quite weird.

The two tests that should shed more light on the situation are:

1. Trying a symlink to an absolute path:
   ```shell
   ln -s "${PWD}/AdGuardHome.yaml.ips" AdGuardHome.yaml
   ```

2. Modifying the rc script to explicitly set the path to the symlink with `-c ./AdGuardHome.yaml` (see `AdGuardHome --help` as well as our Wiki article).
   (By the way, you can use the flag if the only reason for using a symlink is to use a different name for a config file.)

3. It's more of a question, really, but why are you using a soft link in the first place?  If the actual configuration file is in the same directory a simple hard link should work just as well.
# ln -s "${PWD}/AdGuardHome.yaml.ips" AdGuardHome.yaml
# ll
total 29024
-rwxrwxrwx  1 root wheel 29491200 Feb 21 14:12 AdGuardHome*
-rw-rw-rw-  1 root wheel      587 Feb 21 14:12 AdGuardHome.sig
lrwxr-xr-x  1 root wheel       37 Feb 23 00:03 AdGuardHome.yaml@ -> /opt/AdGuardHome/AdGuardHome.yaml.ips
# ee /usr/local/etc/rc.d/AdGuardHome 

Added "-c ./AdGuardHome.yaml" to the "command_args" to that file and now rebooting.

@knaggsy2000

This comment was marked as resolved.

@knaggsy2000

This comment was marked as resolved.

@knaggsy2000

This comment was marked as resolved.

@knaggsy2000
Copy link
Author

v0.108.0-a.858+36f9feca - still produced the same issue, but now see another update. Let me test one...

@knaggsy2000
Copy link
Author

@ainar-g Yep, symbolic link is still destroyed and replaced with a copy of the file by AGH even with version v0.108.0-a.860+64090115.

@ainar-g ainar-g removed the waiting for data Waiting for users to provide more data. label Mar 13, 2024
@ainar-g ainar-g assigned Mizzick and unassigned ainar-g Mar 13, 2024
@ainar-g
Copy link
Contributor

ainar-g commented Mar 13, 2024

The issue is still open, so we are aware that the issue still exists.

@Mizzick, please try to reproduce on a BSD system. We might need to add some more debug logs to see what goes wrong and when.

@Mizzick
Copy link
Contributor

Mizzick commented Mar 21, 2024

@ainar-g Indeed, I can reproduce the issue either with an absolute or relative path.

@ainar-g ainar-g added bug P3: Medium and removed needs investigation Needs to be reproduced reliably. labels Mar 21, 2024
@ainar-g ainar-g added this to the v0.107.47 milestone Mar 21, 2024
@knaggsy2000
Copy link
Author

@Mizzick Thanks fellow BSD user. Not sure if this happens on a Linux OS too - guess they haven't noticed yet.

I look forward to v0.107.47 which shouldn't have the issue - when that is released I will re-test and provide feedback.

adguard pushed a commit that referenced this issue Apr 1, 2024
Updates #6717.

Squashed commit of the following:

commit d17a6de
Merge: 806ff9b 9305c45
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Apr 1 09:22:33 2024 +0800

    Merge remote-tracking branch 'origin/master' into 6717-fix-conf-symlink

    # Conflicts:
    #	CHANGELOG.md

commit 806ff9b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 28 09:00:00 2024 +0800

    home: imp code

commit 06dbcfe
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 27 13:55:30 2024 +0800

    all: changelog

commit 5476625
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 27 13:43:17 2024 +0800

    home: fix conf symlink usage
@Mizzick
Copy link
Contributor

Mizzick commented Apr 1, 2024

@knaggsy2000 please have a look, we have fixed it.

The new build version v0.108.0-a.874+7d9f33b2 has been just published to the edge channel.

@knaggsy2000
Copy link
Author

@Mizzick Glad to see this so I updated the backup PI via the web interface (which is only on the edge channel) and tried the symbolic link again (while Adguard is stopped): -

# ll
total 29192
-rwxr-xr-x  1 root wheel 29622272 Apr  1 23:24 AdGuardHome*
-rw-rw-rw-  1 root wheel      566 Apr  1 23:24 AdGuardHome.sig
lrwxr-xr-x  1 root wheel       20 Apr  1 23:33 AdGuardHome.yaml@ -> AdGuardHome.yaml.ips
-rw-r--r--  1 root wheel    12509 Apr  1 23:30 AdGuardHome.yaml.ips

So starting up...

# /opt/AdGuardHome/AdGuardHome -s start
2024/04/01 23:34:00 [info] AdGuard Home, version v0.108.0-a.874+7d9f33b2
2024/04/01 23:34:00 [info] service: control action: start
2024/04/01 23:34:00 [info] service: action start has been done successfully on freebsd

Checking the symbolic link: -

# ll
total 29208
-rwxr-xr-x  1 root wheel 29622272 Apr  1 23:24 AdGuardHome*
-rw-rw-rw-  1 root wheel      566 Apr  1 23:24 AdGuardHome.sig
-rw-r--r--  1 root wheel    12509 Apr  1 23:34 AdGuardHome.yaml
-rw-r--r--  1 root wheel    12509 Apr  1 23:30 AdGuardHome.yaml.ips

Nope, it's STILL being destroyed and replaced by a copy of the original file.

I'm sad to say that the issue doesn't appear to be fixed - is there anything I can help with?

@Mizzick
Copy link
Contributor

Mizzick commented Apr 3, 2024

I guess this could be related to #2614.

@knaggsy2000 If you please check the contents of /usr/local/etc/rc.d/AdGuardHome?

@knaggsy2000
Copy link
Author

@Mizzick I see that there's new versions for both the edge and stable - just updated those PIs to those. But I'm ONLY testing issues against the edge branch as to not wreck my network.

What do you want feedback on with that contents of that file?

@knaggsy2000
Copy link
Author

knaggsy2000 commented Apr 5, 2024

@Mizzick

total 30056
-rwxr-xr-x  1 root wheel 30474402 Apr  5 21:50 AdGuardHome*
-rw-rw-rw-  1 root wheel      566 Apr  5 21:50 AdGuardHome.sig
lrwxr-xr-x  1 root wheel       20 Apr  5 21:57 AdGuardHome.yaml@ -> AdGuardHome.yaml.ips
-rw-r--r--  1 root wheel    12392 Apr  1 23:32 AdGuardHome.yaml.all
-rw-r--r--  1 root wheel    12509 Apr  1 23:30 AdGuardHome.yaml.ips
# /opt/AdGuardHome/AdGuardHome -s start
2024/04/05 21:57:58 [info] AdGuard Home, version v0.108.0-a.880+fd25dcac
2024/04/05 21:57:58 [info] service: control action: start
2024/04/05 21:57:58 [info] service: action start has been done successfully on freebsd

# ll
total 30072
-rwxr-xr-x  1 root wheel 30474402 Apr  5 21:50 AdGuardHome*
-rw-rw-rw-  1 root wheel      566 Apr  5 21:50 AdGuardHome.sig
-rw-r--r--  1 root wheel    12509 Apr  5 21:57 AdGuardHome.yaml
-rw-r--r--  1 root wheel    12392 Apr  1 23:32 AdGuardHome.yaml.all
-rw-r--r--  1 root wheel    12509 Apr  1 23:30 AdGuardHome.yaml.ips

Issue STILL stands on edge - v0.108.0-a.880+fd25dcac.

@Mizzick
Copy link
Contributor

Mizzick commented Apr 9, 2024

@Mizzick I see that there's new versions for both the edge and stable - just updated those PIs to those. But I'm ONLY testing issues against the edge branch as to not wreck my network.

What do you want feedback on with that contents of that file?

It actually contains the line with command_args:

command_args="-P ${pidfile} -p ${pidfile_child} -T ${name} -r {{.WorkingDirectory}}/{{.Name}}"

Please check that the working dir argument is correct, and also we might try to experiment with it.

@knaggsy2000
Copy link
Author

@Mizzick Updated the edge PI to v0.108.0-a.883+ff7c715c.

Let me check that startup script (/usr/local/etc/rc.d/AdGuardHome): -

command_args="-P ${pidfile} -p ${pidfile_child} -T ${name} -r /opt/AdGuardHome/AdGuardHome -c ./AdGuardHome.yaml"

How is that looking?

@Mizzick
Copy link
Contributor

Mizzick commented Apr 12, 2024

@knaggsy2000 have you added -c ./AdGuardHome.yaml?
As we don't have it here.

@knaggsy2000
Copy link
Author

knaggsy2000 commented Apr 12, 2024

@Mizzick Yes, as I mentioned. Issue still happens.

adguard pushed a commit that referenced this issue Apr 23, 2024
Updates #6717.

Squashed commit of the following:

commit ae80a77
Merge: 73bd061 f85d048
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 23 13:26:05 2024 +0200

    Merge remote-tracking branch 'origin/master' into 6717-freebsd-daemon

commit 73bd061
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Sun Apr 14 10:23:14 2024 +0200

    home: imp freebsd daemon
@Mizzick
Copy link
Contributor

Mizzick commented Apr 23, 2024

@Mizzick Yes, as I mentioned. Issue still happens.

You might try to use an absolute path, or remove -c ./AdGuardHome.yaml, as it works as default.

@Mizzick
Copy link
Contributor

Mizzick commented Apr 23, 2024

@knaggsy2000 and there is also the new build v0.108.0-a.891+60f48e2d, just published to the edge channel.

@knaggsy2000
Copy link
Author

@Mizzick

  1. Updated the test PI to that version
  2. Removed the -c option from the rc.d script
  3. Stopped the service
  4. Removed the config file (as it previously was a copy)
  5. "ln -s" to a config file
  6. Started service

Oh well now - the symbolic link hasn't been removed, that's good news ^^.

When will this change be pushed to stable?

@knaggsy2000
Copy link
Author

Once it reaches the stable branch, then this issue can be closed.

Thanks for all of your time.

annguyen0 pushed a commit to annguyen0/AdGuardHome that referenced this issue May 10, 2024
* Pull request 2138: AG-27492-client-persistent-storage

Squashed commit of the following:

commit 37e33ec
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 14 15:25:25 2024 +0300

    aghalg: imp code

commit 6b2f09a
Merge: b8ea924 3773628
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 14 15:04:59 2024 +0300

    Merge branch 'master' into AG-27492-client-persistent-storage

commit b8ea924
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 13 19:07:52 2024 +0300

    home: imp tests

commit aa6fec0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 13 14:54:28 2024 +0300

    home: imp docs

commit 10637fd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 8 20:16:11 2024 +0300

    all: imp code

commit b45c7d8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 7 19:15:11 2024 +0300

    aghalg: add tests

commit 7abe33d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 6 20:50:22 2024 +0300

    all: imp code, tests

commit 4a44e99
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 1 14:59:11 2024 +0300

    all: persistent client index

commit 66b16e2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 31 15:06:05 2024 +0300

    aghalg: ordered map

* Pull request 2150: AG-28455 rc versions

Squashed commit of the following:

commit 9b80bf2
Merge: 2c18415 fede297
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 16 15:49:23 2024 +0300

    Merge branch 'master' into AG-28455-rc-versions

commit 2c18415
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 14 13:01:30 2024 +0300

    scripts: imp code

commit f096505
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 13 14:52:10 2024 +0300

    scripts: imp code

commit a5bed23
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 12 18:35:52 2024 +0300

    scripts: fix typo

commit 36e9ea1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 12 15:41:57 2024 +0300

    scripts: revert changes, imp docs

commit d74c85d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 5 18:12:38 2024 +0300

    all: mark rc versions separately

* Pull request 2152: 4923 gopacket DHCP vol.7

Updates AdguardTeam#4923.

Squashed commit of the following:

commit 0f90eb3
Merge: 38b3165 bd99e3e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 19 20:11:38 2024 +0300

    Merge branch 'master' into 4923-gopacket-dhcp-vol.7

commit 38b3165
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 19 14:52:01 2024 +0300

    dhcpsvc: imp docs

commit 0a07892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 19 14:48:19 2024 +0300

    dhcpsvc: imp code

commit 30691f0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Feb 15 19:57:41 2024 +0300

    dhcpsvc: imp code, dry

commit 20f5ef8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Feb 15 15:57:09 2024 +0300

    dhcpsvc: finish leases methods

* Pull request 2153: 6610-hostsfile-enabled

Updates AdguardTeam#6610.

Squashed commit of the following:

commit 13522f0
Merge: befa3bd 6fd0a62
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 21 12:53:08 2024 +0300

    Merge branch 'master' into 6610-hostsfile-enabled

commit befa3bd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Feb 19 15:56:20 2024 +0300

    all: upd chlog

commit c195430
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 15 20:52:52 2024 +0300

    home: hostsfile enabled

* Pull request 2156: 6717-conf-path-logs

Updates AdguardTeam#6717.

Squashed commit of the following:

commit 05a7e18
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 21 16:44:00 2024 +0300

    home: imp docs, logs

* Fix blank settings page when access clients first

* Pull request 2155: AG-27492-client-persistent-index

Squashed commit of the following:

commit 1f99640
Merge: 5a9211e 9276afd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 27 13:13:03 2024 +0300

    Merge branch 'master' into AG-27492-client-persistent-index

commit 5a9211e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 22 19:08:35 2024 +0300

    all: add todo

commit a4fc949
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 21 14:48:33 2024 +0300

    all: client persistent index

* Pull request 2154: 6723 caching bootstrap

Updates AdguardTeam#6723.

Squashed commit of the following:

commit 594286c
Merge: 17411a7 31c3d7d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 28 14:01:06 2024 +0300

    Merge branch 'master' into 6723-caching-bootstrap

commit 17411a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 26 20:51:01 2024 +0300

    all: up[d finally

commit f47491c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 21 14:25:49 2024 +0300

    all: log changes

commit a04fc78
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 20 16:30:08 2024 +0300

    all: upd proxy

* Pull request 2161: Upd Go

Squashed commit of the following:

commit 3047031
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 15:42:57 2024 +0300

    all: log changes better

commit c47f31a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 15:33:19 2024 +0300

    bamboo-specs: upd img

commit 5286ca1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 14:59:18 2024 +0300

    tools: upd go

commit fd5e94f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 14:11:05 2024 +0300

    all: upd go

* Pull request 2160: AG-30904-fix-ip-in-logs

Squashed commit of the following:

commit 0a54ca2
Merge: 1d30c09 5565b9e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Mar 6 16:19:36 2024 +0300

    Merge branch 'master' into AG-30904-fix-ip-in-logs

commit 1d30c09
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Mar 5 17:14:02 2024 +0300

    all: missing ip in logs

* Pull request 2162: upd-all

Squashed commit of the following:

commit 206c01e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 6 17:54:21 2024 +0300

    all: upd i18n, svcs, tools, trackers

* Pull request 2165: upd-chlog

Squashed commit of the following:

commit 74c903d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 7 15:44:52 2024 +0300

    all: upd chlog

* Pull request: fix served from cache label

Updates AdguardTeam#6740.

Squashed commit of the following:

commit a3cb491
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Mar 7 17:15:55 2024 +0300

    fix tooltip label

commit 4ab301e
Merge: 6bc325d 5388ad5
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Mar 7 17:08:45 2024 +0300

    Merge branch 'master' into ADG-8259

commit 6bc325d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Mar 7 09:58:35 2024 +0300

    fix icon

commit 8274faa
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Mar 7 09:56:50 2024 +0300

    ADG-8259 fix server from cache label

* Pull request 2159: Upd proxy

Squashed commit of the following:

commit 4468e82
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 11 13:50:36 2024 +0300

    all: upd dnsproxy

commit 7887f52
Merge: 9120da6 36f9fec
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 11 13:50:09 2024 +0300

    Merge branch 'master' into upd-proxy

commit 9120da6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 5 11:50:16 2024 +0300

    all: upd proxy

* Pull request 2164: 6712-hourly-graphs

Updates AdguardTeam#6712.

Squashed commit of the following:

commit dd4c822
Merge: 7320786 28a6b9f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Mar 12 12:38:19 2024 +0300

    Merge branch 'master' into 6712-hourly-graphs

commit 7320786
Merge: ca29ee8 5388ad5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Mar 7 16:25:49 2024 +0300

    Merge branch 'master' into 6712-hourly-graphs

commit ca29ee8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Mar 7 14:41:45 2024 +0300

    all: upd chlog

commit 9d6154a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Mar 7 14:10:32 2024 +0300

    all: hourly graphs

* Pull request 2169: fix-rc

Squashed commit of the following:

commit 153271c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 12 18:08:26 2024 +0300

    all: rm trigger for rc

* Pull request 2171: AG-28455 remove checkout

Squashed commit of the following:

commit 3b90850
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 13 15:34:11 2024 +0300

    version: sort version strings

commit 7a9cb73
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 13 13:02:36 2024 +0300

    all: account candidate channel

commit 76d2374
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 12 20:02:55 2024 +0300

    bamboo-specs: add todo

commit f99c726
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 12 20:01:38 2024 +0300

    bamboo-specs: revert release

commit 70a3b3e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 12 19:58:20 2024 +0300

    bamboo-specs: rm explicit checkout

* Pull request 2173: upd-all

Squashed commit of the following:

commit 19b10b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 13 17:20:52 2024 +0300

    client: upd i18n more

commit 9f44193
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 13 17:04:55 2024 +0300

    all: upd deps, i18n, svcs

* Pull request 2174: 6820 Warn local ptrs

Squashed commit of the following:

commit c231965
Merge: c6162a2 bcd1430
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Mar 14 18:10:20 2024 +0300

    Merge branch 'master' into 6820-warn-local-ptrs

commit c6162a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 13 19:35:20 2024 +0300

    dnsforward: fix doc

commit c6cce96
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 13 19:19:49 2024 +0300

    all: fix private conf fail on start

commit c11fc3e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 13 18:43:31 2024 +0300

    WIP

* Pull request 2175: split-snap-docker

Squashed commit of the following:

commit 895f50c
Merge: 5bd2edd 4e3b53f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 14 19:11:32 2024 +0300

    Merge branch 'master' into split-snap-docker

commit 5bd2edd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 14 19:00:06 2024 +0300

    bamboo-specs: split snap docker, use go-builder

* Pull request 2176: AG-20945-rule-list-engine

Squashed commit of the following:

commit 56756b2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Mar 15 15:40:39 2024 +0300

    all: imp code, docs, tests

commit 45849e6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 14 20:18:07 2024 +0300

    rulelist: add engine, textengine

* Pull request 2178: upd-chlog

Squashed commit of the following:

commit 026be50
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 17:57:17 2024 +0300

    all: upd chlog

* Pull request 2179: upd-docker

Squashed commit of the following:

commit 17e145c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 18:49:18 2024 +0300

    bamboo-specs: upd builder img

commit d6399a0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 18:35:01 2024 +0300

    bamboo-specs: fix frontend build

commit 9f4cbf5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 18:21:50 2024 +0300

    bamboo-specs: fix yaml

commit a26d2ab
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 18:18:57 2024 +0300

    all: use new docker imgs

* Pull request 2166: 5829-trusted-ip

Updates AdguardTeam#5829.

Squashed commit of the following:

commit 8a93b30
Merge: 8e4429c 54f77c0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Mar 20 19:15:07 2024 +0300

    Merge branch 'master' into 5829-trusted-ip

commit 8e4429c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Mar 20 18:37:26 2024 +0300

    all: upd chlog

commit b598a8d
Merge: 1f58bf8 0542339
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Mar 20 18:34:13 2024 +0300

    Merge branch 'master' into 5829-trusted-ip

commit 1f58bf8
Merge: ffb4b9a c64a36c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Mar 20 17:09:09 2024 +0300

    Merge branch 'master' into 5829-trusted-ip

commit ffb4b9a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Mar 14 17:40:07 2024 +0300

    home: fix alignment

commit 7f11807
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Mar 14 17:35:13 2024 +0300

    all: imp code

commit 2aee9a6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Mar 11 18:17:58 2024 +0300

    home: real ip in logs

* Pull request 2180: fix-docker-build

Squashed commit of the following:

commit 8713a08
Merge: 7eed5e8 3b12ff2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 20:26:11 2024 +0300

    Merge branch 'master' into fix-docker-build

commit 7eed5e8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Mar 20 20:12:16 2024 +0300

    bamboo-specs: fix docker build

* Pull request 2181: imp-docs

Squashed commit of the following:

commit 1f7be03
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 21 13:35:37 2024 +0300

    all: use standard md style in some docs

* Pull request 2182: AG-20945-rule-list-id

Squashed commit of the following:

commit 87bad8c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 21 16:39:12 2024 +0300

    all: imp lint, names, tests

commit 284f8c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 21 15:37:54 2024 +0300

    filtering: imp id handling

* Pull request 2184: 6851 upstream mode reset

Updates AdguardTeam#6851.

Squashed commit of the following:

commit ffc50da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 25 17:55:39 2024 +0300

    all: fix changelog

commit cdc2193
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Mar 25 17:28:06 2024 +0300

    dnsforward: fix upstream mode set

* Pull request: 6717-fix-conf-symlink

Updates AdguardTeam#6717.

Squashed commit of the following:

commit d17a6de
Merge: 806ff9b 9305c45
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Apr 1 09:22:33 2024 +0800

    Merge remote-tracking branch 'origin/master' into 6717-fix-conf-symlink

    # Conflicts:
    #	CHANGELOG.md

commit 806ff9b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 28 09:00:00 2024 +0800

    home: imp code

commit 06dbcfe
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 27 13:55:30 2024 +0800

    all: changelog

commit 5476625
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 27 13:43:17 2024 +0800

    home: fix conf symlink usage

* Pull request 2188: imp-readme

Squashed commit of the following:

commit 1abd78a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 1 17:53:50 2024 +0300

    all: imp readme; add projects

* Pull request 2190: 6758-embed-tzdata

Closes AdguardTeam#6758.

Squashed commit of the following:

commit d62b427
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 2 18:25:34 2024 +0300

    all: add docs

commit bb129d7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 2 17:04:42 2024 +0300

    all: upd chlog

commit 59573d9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 2 15:38:42 2024 +0300

    all: embed tzdata

* Pull request 2187: upd-golibs

Squashed commit of the following:

commit 63c14cf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 2 20:10:10 2024 +0300

    all: imp code, docs

commit 185ccdd
Merge: b6ca80a d4fff41
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 2 20:04:23 2024 +0300

    Merge branch 'master' into upd-golibs

commit b6ca80a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 2 20:01:10 2024 +0300

    all: upd to tags

commit 474f623
Author: Ainar Garipov <a.garipov@adguard.com>
Date:   Tue Mar 26 16:33:45 2024 +0300

    all: upd golibs

* Pull request 2194: upd-all

Squashed commit of the following:

commit 483b77a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 3 20:41:12 2024 +0300

    all: upd docker

commit 6fff1f8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 3 20:25:07 2024 +0300

    all: upd go, i18n, flts, svcs

* Pull request 2195: upd-go-code

Squashed commit of the following:

commit a1bd3c2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 4 14:59:37 2024 +0300

    all: upd more

commit 9e55bbb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 4 14:12:45 2024 +0300

    all: upd go code

* Pull request 2183: AG-27492-client-runtime-index

Squashed commit of the following:

commit d0b37e3
Merge: 025c29b ee619b2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Apr 4 18:58:08 2024 +0300

    Merge branch 'master' into AG-27492-client-runtime-index

commit 025c29b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Apr 1 17:20:15 2024 +0300

    client: imp code

commit 548a15c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Mar 28 13:43:17 2024 +0300

    all: add tests

commit c9015e7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Mar 25 16:33:30 2024 +0300

    all: imp docs

commit 81e8b94
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Mar 25 15:33:17 2024 +0300

    all: imp code

commit 1428d60
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Mar 25 14:45:01 2024 +0300

    all: client runtime index

* Pull request 2197: upd-chlog

Squashed commit of the following:

commit 85deb72
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 5 18:30:40 2024 +0300

    all: upd chlog

* Pull request 2189: 5345-ipset-file-comments

Updates AdguardTeam#5345.

Squashed commit of the following:

commit 66ceac9
Merge: 8be4dce 82247d7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Apr 5 19:05:48 2024 +0300

    Merge branch 'master' into 5345-ipset-file-comments

commit 8be4dce
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 2 14:56:21 2024 +0300

    all: upd chlog

commit 53c7213
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 2 14:48:56 2024 +0300

    dnsforward: ipset file comments

* chore: fix function names in comment

Signed-off-by: looklose <shishuaiqun@yeah.net>

* Pull request 2193: AGDNS-1982 Upd proxy

Closes AdguardTeam#6854.Updates AdguardTeam#6875.

Squashed commit of the following:

commit b98adbc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Apr 10 19:21:44 2024 +0300

    dnsforward: upd proxy, imp code, docs

commit 4de1eb2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Apr 10 16:09:58 2024 +0300

    WIP

commit afa9d61
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 9 19:24:09 2024 +0300

    all: log changes

commit c834067
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 9 19:06:10 2024 +0300

    dnsforward: move code

commit 08bb7d4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 9 18:09:46 2024 +0300

    dnsforward: imp code

commit b27547e
Merge: b7efca7 6f36ebc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 9 17:33:19 2024 +0300

    Merge branch 'master' into AGDNS-1982-upd-proxy

commit b7efca7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 9 17:27:14 2024 +0300

    all: upd proxy finally

commit 3e16fa8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Apr 5 18:20:13 2024 +0300

    dnsforward: upd proxy

commit f3cdfc8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 4 20:37:32 2024 +0300

    all: upd proxy, golibs

commit a79298d
Merge: 9feeba5 fd25dca
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 4 20:34:01 2024 +0300

    Merge branch 'master' into AGDNS-1982-upd-proxy

commit 9feeba5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 4 20:25:57 2024 +0300

    all: imp code, docs

commit 6c68d46
Merge: d8108e6 ee619b2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 4 18:46:11 2024 +0300

    Merge branch 'master' into AGDNS-1982-upd-proxy

commit d8108e6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Apr 3 19:25:27 2024 +0300

    all: imp code

commit 2046156
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Apr 3 17:10:33 2024 +0300

    all: remove private rdns logic

* Pull request 2206: upd-golibs

Squashed commit of the following:

commit bb94329
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 15 13:53:23 2024 +0300

    all: upd golibs

* Pull request 2199: 5812-query-log-client-id

Updates AdguardTeam#5812.

Squashed commit of the following:

commit 43aa147
Merge: 97ab712 36986a8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Apr 15 15:00:36 2024 +0300

    Merge branch 'master' into 5812-query-log-client-id

commit 97ab712
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Apr 11 14:22:58 2024 +0300

    all: upd chlog

commit 525ac91
Merge: 5d4db3f ff7c715
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Apr 11 14:15:28 2024 +0300

    Merge branch 'master' into 5812-query-log-client-id

commit 5d4db3f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 10 16:19:11 2024 +0300

    dnsforward: client id priority

* Pull request 2205: AGDNS-1982 Fix RDNS HTTP

Squashed commit of the following:

commit a7d5023
Merge: 0be18b9 df7f19e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Apr 15 15:11:51 2024 +0300

    Merge branch 'master' into AGDNS-1982-fix-rdns-http

commit 0be18b9
Merge: 54c1017 36986a8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Apr 15 15:04:42 2024 +0300

    Merge branch 'master' into AGDNS-1982-fix-rdns-http

commit 54c1017
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Apr 15 14:00:14 2024 +0300

    all: log changes

commit 851a1a3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Apr 15 13:44:13 2024 +0300

    dnsforward: fix http private rdns

* Pull request 2202: Fix access error

Squashed commit of the following:

commit 5507401
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 16 17:16:41 2024 +0300

    all: rm replace

commit 983f8d1
Merge: d9fc69d 201ac73
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Apr 16 16:06:28 2024 +0300

    Merge branch 'master' into fix-access-error

commit d9fc69d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 11 19:18:24 2024 +0300

    all: fix before request, upd golibs

* Pull request 2201: 6192-access-ipv6-zone

Updates AdguardTeam#6192.

Squashed commit of the following:

commit e98c2f0
Merge: 4dd9218 6f7d5cc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 16 17:24:38 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit 4dd9218
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 16 16:12:24 2024 +0300

    all: upd chlog

commit e126e12
Merge: d57c34c 201ac73
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 16 14:34:45 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit d57c34c
Merge: decb768 df7f19e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Apr 15 16:26:57 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit decb768
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Apr 11 17:06:54 2024 +0300

    all: upd chlog

commit c8184be
Merge: 5e0059b ff7c715
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Apr 11 16:52:10 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit 5e0059b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 10 16:59:37 2024 +0300

    dnsforward: access ipv6 zone

* Pull request: AG-31778-fix-safesearch-https

Squashed commit of the following:

commit 85ea3d9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Apr 18 15:19:38 2024 +0200

    all: imp docs

commit b0695da
Merge: a79f98f 48c6242
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 17 11:06:49 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https

    # Conflicts:
    #	CHANGELOG.md

commit a79f98f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 17 11:05:34 2024 +0200

    dnsforward: imp code

commit b901a11
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 16 11:03:52 2024 +0200

    dnsforward: imp code

commit fb6e669
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 16 10:08:51 2024 +0200

    all: safesearch rewrites

commit 88add21
Merge: b78ad8f 201ac73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 16 09:43:20 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https

    # Conflicts:
    #	CHANGELOG.md

commit b78ad8f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Apr 12 13:34:39 2024 +0200

    all: safesearch rewrites

commit fb3efbb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Apr 11 13:15:37 2024 +0200

    safesearch: imp code

commit 1193c70
Merge: 14e823d ff7c715
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Apr 11 13:13:44 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https

    # Conflicts:
    #	CHANGELOG.md

commit 14e823d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Apr 11 13:11:43 2024 +0200

    all: safesearch https

commit cd403a2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Apr 11 12:09:27 2024 +0200

    Revert "all: safesearch https"

    This reverts commit 1c9564b.

commit 1c9564b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 10 12:41:47 2024 +0200

    all: safesearch https

commit 5f42688
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 10 09:22:30 2024 +0200

    filtering: imp code

commit eb9bd9f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 10 09:19:22 2024 +0200

    all: changelog

commit 0c77c70
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 10 08:55:22 2024 +0200

    safesearch: imp tests

commit 492a93f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 9 14:45:16 2024 +0200

    all: changelog

commit a665e72
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 9 14:41:24 2024 +0200

    safesearch: https req

* Pull request 2207: 6882 Extend private rDNS

Updates AdguardTeam#6882.

Squashed commit of the following:

commit 80fa6d6
Merge: c0fdf1a 762ef4a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Apr 22 18:53:18 2024 +0300

    Merge branch 'master' into 6882-extend-private-rdns

commit c0fdf1a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 18 18:19:36 2024 +0300

    client: imp ui text

commit f07a509
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 18 16:22:11 2024 +0300

    all: imp docs, upd proxy

commit 0d33079
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 18 12:48:50 2024 +0300

    all: upd proxy

* Pull request: 6717-freebsd-daemon

Updates AdguardTeam#6717.

Squashed commit of the following:

commit ae80a77
Merge: 73bd061 f85d048
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 23 13:26:05 2024 +0200

    Merge remote-tracking branch 'origin/master' into 6717-freebsd-daemon

commit 73bd061
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Sun Apr 14 10:23:14 2024 +0200

    home: imp freebsd daemon

* Pull request: AG-31863-dnsforward-tests

Merge in DNS/adguard-home from AG-31863-dnsforward-tests to master

Squashed commit of the following:

commit cbdad62
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 24 15:00:15 2024 +0200

    dnsforward: imp tests

commit b71304a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 24 12:53:51 2024 +0200

    dnsforward: imp tests

commit 3c42fca
Merge: 50888df 60f48e2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 24 08:41:19 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit 50888df
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 24 08:39:37 2024 +0200

    dnsforward: imp code

commit dcd5e41
Merge: af2507b f85d048
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 23 10:02:45 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit af2507b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 23 10:01:30 2024 +0200

    dnsforward: imp tests

commit 67fc9d3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Apr 22 10:37:45 2024 +0200

    dnsforward: imp tests

commit e7f7df2
Merge: c610a6c 762ef4a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Apr 22 09:51:04 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit c610a6c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Apr 19 12:28:49 2024 +0200

    dnsforward: imp tests

commit ca252e8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Apr 19 11:58:49 2024 +0200

    dnsforward: imp tests

commit 9d4de18
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Apr 19 11:38:15 2024 +0200

    dnsforward: imp tests

commit a349374
Merge: 2243770 48c6242
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Apr 17 11:02:56 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit 2243770
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 16 10:56:40 2024 +0200

    dnsforward: imp tests

commit 4c4b565
Merge: f1e4b72 201ac73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Apr 16 10:53:48 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit f1e4b72
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Apr 15 12:36:21 2024 +0200

    dnsforward: imp tests

commit 6ee6cc9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Sun Apr 14 13:55:09 2024 +0200

    dnsforward: add test

* Pull request 2209: 6422-upd-quic-go

Updates AdguardTeam#6422.

Squashed commit of the following:

commit 6baf47e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 24 16:37:15 2024 +0300

    all: upd again

commit 2ad480a
Merge: 5b260d0 0cff3db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 24 16:37:02 2024 +0300

    Merge branch 'master' into 6422-upd-quic-go

commit 5b260d0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 24 14:39:35 2024 +0300

    all: upd quic-go

* Pull request 2200: 6312-client-ipv6-zone

Updates AdguardTeam#6312.

Squashed commit of the following:

commit bd9146e
Merge: 58d2fd9 856cc40
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 24 18:09:19 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit 58d2fd9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 24 18:00:56 2024 +0300

    client: imp naming

commit 922a14b
Merge: 6f4d58f 60f48e2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 24 14:29:00 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit 6f4d58f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 24 14:27:55 2024 +0300

    client: imp docs

commit fa292ee
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Apr 22 19:20:28 2024 +0300

    client: fix typo

commit 599414b
Merge: 5025717 762ef4a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Apr 22 18:42:06 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit 5025717
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Apr 22 18:39:22 2024 +0300

    all: imp code; add tests

commit 155b2fe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 16 19:56:00 2024 +0300

    all: upd chlog; imp code

commit 7a4426c
Merge: e9c1cbb 48c6242
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Apr 16 19:52:00 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit e9c1cbb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 10 16:23:07 2024 +0300

    client: client ipv6 zone

* Pull request 2211: fix-i18n

Squashed commit of the following:

commit 7f15bcb
Merge: 0f2efaa c1ee2c7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 24 20:01:42 2024 +0300

    Merge branch 'master' into fix-i18n

commit 0f2efaa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 24 19:54:35 2024 +0300

    client: imp i18n

* Pull request 2212: 6744 Upd proxy

Updates AdguardTeam#6744.

Squashed commit of the following:

commit 160694a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Apr 26 14:46:04 2024 +0300

    all: upd to release

commit b7dd961
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 25 20:45:04 2024 +0300

    all: fix tags

commit 2374845
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Apr 25 19:54:39 2024 +0300

    all: upd proxy

* dnsforward, home: imp more

* Pull request 2210: AG-32341-client-duplicate-uids

Squashed commit of the following:

commit 6f83ec8
Merge: 2fea9c0 2383ab5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Apr 26 19:23:15 2024 +0300

    Merge branch 'master' into AG-32341-client-duplicate-uids

commit 2fea9c0
Merge: 672a30c b9d5e5b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Apr 26 14:00:49 2024 +0300

    Merge branch 'master' into AG-32341-client-duplicate-uids

commit 672a30c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Apr 26 13:59:59 2024 +0300

    all: upd chlog

commit 7c2b26e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 24 21:08:47 2024 +0300

    all: imp chlog

commit fcca9af
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Apr 24 18:56:34 2024 +0300

    all: fix client duplicate uids

* Pull request 2214: 6744 Fix TLD subdomain

Updates AdguardTeam#6744.

Squashed commit of the following:

commit 04894ca
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu May 2 16:48:37 2024 +0300

    all: upd proxy finally

commit 0cb063e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu May 2 15:26:17 2024 +0300

    all: upd again

commit 3deb71c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu May 2 14:46:38 2024 +0300

    all: upd proxy

* Pull request 2217: Upd Go

Squashed commit of the following:

commit a5be7f9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed May 8 15:01:52 2024 +0300

    all: upd go

---------

Signed-off-by: looklose <shishuaiqun@yeah.net>
Co-authored-by: Stanislav Chzhen <s.chzhen@adguard.com>
Co-authored-by: Eugene Burkov <e.burkov@adguard.com>
Co-authored-by: Ainar Garipov <a.garipov@adguard.com>
Co-authored-by: Hoàng Rio <donghoang.nguyen@outlook.com>
Co-authored-by: Dimitry Kolyshev <dkolyshev@adguard.com>
Co-authored-by: Ildar Kamalov <ik@adguard.com>
Co-authored-by: looklose <shishuaiqun@yeah.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

4 participants