Merge branch 'master' into rrl-wip

diff --cc .gitlab-ci.yml
Simple merge

diff --cc daemon/lua/kres-gen-33.lua
Simple merge

diff --cc daemon/lua/kres-gen.sh
Simple merge

diff --cc daemon/main.c
index 95df2e5a3a80ce436150e46121d2c9d991141afd,44b8ae4c1b745c19ae91f6c9119b895d7738947f..d18f59f90b7534b5fda7cb697b4326f1f91daa59
--- 1/daemon/main.c
--- 2/daemon/main.c
+++ b/daemon/main.c
@@@ -11,13 -11,7 +11,9 @@@
  #include "daemon/network.h"
  #include "daemon/udp_queue.h"
  #include "daemon/worker.h"
 +#include "daemon/ratelimiting.h"
 +#include "daemon/defer.h"
  
- #ifdef ENABLE_DOH2
- #include "daemon/http.h"
- #endif
- 
  #include "lib/defines.h"
  #include "lib/dnssec.h"
  #include "lib/log.h"

diff --cc daemon/proxyv2.c
Simple merge

diff --cc daemon/proxyv2.h
index 9bba34762ce96946ef4f05a1c3ad8356b157c315,d514cd6272ec78c543e6f6f0f8f0e76fce762321..8f16ea10408e9b80232261966f5bec507088df35
--- 1/daemon/proxyv2.h
--- 2/daemon/proxyv2.h
+++ b/daemon/proxyv2.h
@@@ -30,10 -30,3 +30,7 @@@ struct proxy_result 
         * the proxy is unencrypted. */
        bool has_tls : 1;
  };
- 
- /** Initializes the protocol layers managed by the PROXYv2 "module". */
- void proxy_protolayers_init(void);
 +
 +/** Checks whether the use of PROXYv2 protocol is allowed for the specified
 + * address. */
 +bool proxy_allowed(const struct sockaddr *saddr);

diff --cc daemon/session2.c
Simple merge

diff --cc daemon/session2.h
Simple merge

diff --cc daemon/worker.c
Simple merge

diff --cc lib/utils.c
Simple merge

diff --cc manager/knot_resolver_manager/datamodel/config_schema.py
index 9da7007eba369563ced99a6b63c01f9171d682cc,35371231087d9e0088c8c040d30735d9a63d1986..d80f664a3e9ef7b8f35f18d957089856c93ee9e4
--- 1/manager/knot_resolver_manager/datamodel/config_schema.py
--- 2/manager/knot_resolver_manager/datamodel/config_schema.py
+++ b/manager/knot_resolver_manager/datamodel/config_schema.py
@@@ -21,9 -21,9 +21,10 @@@ from knot_resolver_manager.datamodel.te
  from knot_resolver_manager.datamodel.types import Dir, EscapedStr, IntPositive
  from knot_resolver_manager.datamodel.view_schema import ViewSchema
  from knot_resolver_manager.datamodel.webmgmt_schema import WebmgmtSchema
 +from knot_resolver_manager.datamodel.rate_limiting_schema import RateLimitingSchema
  from knot_resolver_manager.utils.modeling import ConfigSchema
  from knot_resolver_manager.utils.modeling.base_schema import lazy_default
+ from knot_resolver_manager.utils.modeling.exceptions import AggregateDataValidationError, DataValidationError
  
  _DEFAULT_RUNDIR = "/var/run/knot-resolver"
  

diff --cc manager/knot_resolver_manager/datamodel/templates/worker-config.lua.j2
Simple merge

diff --cc manager/knot_resolver_manager/kres_manager.py
index 8cfd73c8febc5f21b1094e71b09767b56f8121f3,f916dfaaaaac248f264ddf57a87a3976a308e72f..dbe56817c53a5e83a2f04ea30bc2c2cf85f15e21
--- 1/manager/knot_resolver_manager/kres_manager.py
--- 2/manager/knot_resolver_manager/kres_manager.py
+++ b/manager/knot_resolver_manager/kres_manager.py
@@@ -2,12 -2,12 +2,13 @@@ import asynci
  import logging
  import sys
  import time
 +import os
+ from secrets import token_hex
  from subprocess import SubprocessError
- from typing import Callable, List, Optional
+ from typing import Any, Callable, List, Optional
  
  from knot_resolver_manager.compat.asyncio import create_task
- from knot_resolver_manager.config_store import ConfigStore
+ from knot_resolver_manager.config_store import ConfigStore, only_on_real_changes_update, only_on_real_changes_verifier
  from knot_resolver_manager.constants import (
      FIX_COUNTER_DECREASE_INTERVAL_SEC,
      MANAGER_FIX_ATTEMPT_MAX_COUNTER,

diff --cc meson.build
Simple merge