From a009365df3f0429edfd181d0109372aca1892298 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ale=C5=A1=20Mr=C3=A1zek?= Date: Fri, 28 Feb 2025 10:07:08 +0100 Subject: [PATCH] Revert "python: constants: added API_SOCKET_NAME" This reverts commit cee2250c5a52a4d67ea2a37cc97761ba530f856b. --- python/knot_resolver/constants.py | 9 +++------ python/knot_resolver/constants.py.in | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/python/knot_resolver/constants.py b/python/knot_resolver/constants.py index 525e8629c..d65c24acb 100644 --- a/python/knot_resolver/constants.py +++ b/python/knot_resolver/constants.py @@ -5,18 +5,15 @@ VERSION = "6.0.11" USER = "knot-resolver" GROUP = "knot-resolver" -# default files names -API_SOCK_NAME = "kres-api.sock" - -# default dirs paths +# dirs paths RUN_DIR = Path("/run/knot-resolver") ETC_DIR = Path("/etc/knot-resolver") SBIN_DIR = Path("/usr/sbin") CACHE_DIR = Path("/var/cache/knot-resolver") -# default files paths +# files paths CONFIG_FILE = ETC_DIR / "config.yaml" -API_SOCK_FILE = RUN_DIR / API_SOCK_NAME +API_SOCK_FILE = RUN_DIR / "kres-api.sock" # executables paths KRESD_EXECUTABLE = SBIN_DIR / "kresd" diff --git a/python/knot_resolver/constants.py.in b/python/knot_resolver/constants.py.in index 8c2974a58..35c25ac64 100644 --- a/python/knot_resolver/constants.py.in +++ b/python/knot_resolver/constants.py.in @@ -5,18 +5,15 @@ VERSION = "@version@" USER = "@user@" GROUP = "@group@" -# default files names -API_SOCK_NAME = "kres-api.sock" - -# default dirs paths +# dirs paths RUN_DIR = Path("@run_dir@") ETC_DIR = Path("@etc_dir@") SBIN_DIR = Path("@sbin_dir@") CACHE_DIR = Path("@cache_dir@") -# default files paths +# files paths CONFIG_FILE = ETC_DIR / "config.yaml" -API_SOCK_FILE = RUN_DIR / API_SOCK_NAME +API_SOCK_FILE = RUN_DIR / "kres-api.sock" # executables paths KRESD_EXECUTABLE = SBIN_DIR / "kresd" -- 2.47.2