Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 2701eb7

Browse files
author
Alexey V. Bobrov
committed
Merge branch 'release/1.0.12'
2 parents f95c93c + 44e76c0 commit 2701eb7

File tree

4 files changed

+35
-2
lines changed

4 files changed

+35
-2
lines changed

.travis.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,39 @@ matrix:
77
- os: linux
88
dist: trusty
99
sudo: true
10+
env: ANSIBLE_VERSION='ansible>=2.4,<2.5'
11+
- os: linux
12+
dist: trusty
13+
sudo: true
14+
env: ANSIBLE_VERSION='ansible>=2.3,<2.4'
15+
- os: linux
16+
dist: trusty
17+
sudo: true
18+
env: ANSIBLE_VERSION='latest'
19+
- os: linux
20+
dist: xenial
21+
sudo: true
22+
env: ANSIBLE_VERSION='ansible>=2.4,<2.5'
1023
- os: linux
1124
dist: xenial
1225
sudo: true
26+
env: ANSIBLE_VERSION='ansible>=2.3,<2.4'
27+
- os: linux
28+
dist: xenial
29+
sudo: true
30+
env: ANSIBLE_VERSION='latest'
31+
- os: linux
32+
dist: precise
33+
sudo: true
34+
env: ANSIBLE_VERSION='ansible>=2.4,<2.5'
35+
- os: linux
36+
dist: precise
37+
sudo: true
38+
env: ANSIBLE_VERSION='ansible>=2.3,<2.4'
1339
- os: linux
1440
dist: precise
1541
sudo: true
42+
env: ANSIBLE_VERSION='latest'
1643

1744
# Use the new container infrastructure
1845
sudo: true
@@ -25,7 +52,7 @@ addons:
2552

2653
install:
2754
# Install ansible
28-
- sudo pip install ansible
55+
- if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install $ANSIBLE_VERSION; fi
2956

3057
# Check ansible version
3158
- ansible --version

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,3 +226,5 @@ Author Information
226226
[ClickHouse](https://clickhouse.yandex/docs/en/index.html) by [Yandex LLC](https://yandex.ru/company/).
227227
228228
Role by [AlexeySetevoi](https://github.com/AlexeySetevoi).
229+
230+
Dear contributors, thank you.

tasks/config_db.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
- name: Config | Delete database config
99
command: "clickhouse-client -h localhost -q 'DROP DATABASE IF EXISTS `{{ item.name }}`'"
1010
with_items: "{{ clickhouse_dbs }}"
11-
when: item.state is defined and item.state == 'absent' and item.name in existing_databases.stdout.lines_lines
11+
when: item.state is defined and item.state == 'absent' and item.name in existing_databases.stdout_lines
1212
tags: [config_db]
1313

1414
- name: Config | Create database config

tasks/config_sys.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616
template:
1717
src: config.j2
1818
dest: "{{ clickhouse_path_configdir }}/config.xml"
19+
owner: clickhouse
20+
group: clickhouse
1921
notify: restart-ch
2022
become: true
2123

2224
- name: Config | Generate users config
2325
template:
2426
src: users.j2
2527
dest: "{{ clickhouse_path_configdir }}/users.xml"
28+
owner: clickhouse
29+
group: clickhouse
2630
notify: restart-ch
2731
become: true
2832

0 commit comments

Comments
 (0)