thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13837 from vitlibar/add-user-directories-section-to-default-config

Browse Source 
Add the section <user_directories> to the default config.
This commit is contained in:
Vitaly Baranov 2020-09-14 16:47:32 +03:00 committed by GitHub
commit cae5a23a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
programs/server/config.xml
View File

@ -212,8 +212,17 @@
<!-- Directory with user provided files that are accessible by 'file' table function. --> <!-- Directory with user provided files that are accessible by 'file' table function. -->
<user_files_path>/var/lib/clickhouse/user_files/</user_files_path> <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
<!-- Path to folder where users and roles created by SQL commands are stored. --> <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
<access_control_path>/var/lib/clickhouse/access/</access_control_path> <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). --> <!-- External user directories (LDAP). -->
<ldap_servers> <ldap_servers>
@ -256,9 +265,6 @@
--> -->
</ldap_servers> </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 of settings. -->
<default_profile>default</default_profile> <default_profile>default</default_profile>

3
tests/integration/helpers/0_common_instance_config.xml
View File

@ -4,4 +4,7 @@
<custom_settings_prefixes>custom_</custom_settings_prefixes> <custom_settings_prefixes>custom_</custom_settings_prefixes>
<path>/var/lib/clickhouse/</path> <path>/var/lib/clickhouse/</path>
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path> <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
<!-- For tests which check compatibility with older versions. -->
<users_config>users.xml</users_config>
</yandex> </yandex>