From 421eeeccef7622f8f1462f9bce87303d51b880be Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitbar@yandex-team.ru>
Date: Mon, 17 Aug 2020 17:38:10 +0300
Subject: [PATCH] Add the section user_directories to the default config.

---
 programs/server/config.xml                       | 16 +++++++++++-----
 .../helpers/0_common_instance_config.xml         |  3 +++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/programs/server/config.xml b/programs/server/config.xml
index af01e880dc2..3d7ebf0cd96 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -212,8 +212,17 @@
     <!-- Directory with user provided files that are accessible by 'file' table function. -->
     <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
 
-    <!-- Path to folder where users and roles created by SQL commands are stored. -->
-    <access_control_path>/var/lib/clickhouse/access/</access_control_path>
+    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
+    <user_directories>
+        <users_xml>
+            <!-- Path to configuration file with predefined users. -->
+            <path>users.xml</path>
+        </users_xml>
+        <local_directory>
+            <!-- Path to folder where users created by SQL commands are stored. -->
+            <path>/var/lib/clickhouse/access/</path>
+        </local_directory>
+    </user_directories>
 
     <!-- External user directories (LDAP). -->
     <ldap_servers>
@@ -256,9 +265,6 @@
         -->
     </ldap_servers>
 
-    <!-- Path to configuration file with users, access rights, profiles of settings, quotas. -->
-    <users_config>users.xml</users_config>
-
     <!-- Default profile of settings. -->
     <default_profile>default</default_profile>
 
diff --git a/tests/integration/helpers/0_common_instance_config.xml b/tests/integration/helpers/0_common_instance_config.xml
index 5377efbc241..b27ecf0c3ef 100644
--- a/tests/integration/helpers/0_common_instance_config.xml
+++ b/tests/integration/helpers/0_common_instance_config.xml
@@ -4,4 +4,7 @@
     <custom_settings_prefixes>custom_</custom_settings_prefixes>
     <path>/var/lib/clickhouse/</path>
     <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
+
+    <!-- For tests which check compatibility with older versions. -->
+    <users_config>users.xml</users_config>
 </yandex>