From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Thu, 12 Oct 2023 13:07:07 +0000 (+0200)
Subject: include_dir must be != api_dir for YAML mode
X-Git-Tag: rec-5.0.0-alpha2~1^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb355c474f0601670c8d41dcf3aa6b9e9365bb98;p=thirdparty%2Fpdns.git

include_dir must be != api_dir for YAML mode
---

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 51e603e4b3..ea2b230b6e 100755
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -110,7 +110,7 @@ incoming:
   allow_from_file: acl.list.yml
   allow_notify_from_file: acl-notify.list.yml
 webservice:
-  api_dir: %(conf_dir)s
+  api_dir: %(api_dir)s
 recursor:
   include_dir: %(conf_dir)s
   devonly_regression_test_mode: true
@@ -226,6 +226,8 @@ if daemon == 'authoritative':
 else:
     conf_dir = 'rec-conf.d'
     ensure_empty_dir(conf_dir)
+    api_dir = 'rec-api.d'
+    ensure_empty_dir(api_dir)
     with open('acl.list.yml', 'w') as acl_list:
         acl_list.write(ACL_LIST_TPL)
     with open('acl-notify.list.yml', 'w') as acl_notify_list: