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

Commit

Permalink
Merge branch 'release/1.0.12'
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey V. Bobrov committed May 7, 2018
2 parents f95c93c + 44e76c0 commit 2701eb7
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
29 changes: 28 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,39 @@ matrix:
- os: linux
dist: trusty
sudo: true
env: ANSIBLE_VERSION='ansible>=2.4,<2.5'
- os: linux
dist: trusty
sudo: true
env: ANSIBLE_VERSION='ansible>=2.3,<2.4'
- os: linux
dist: trusty
sudo: true
env: ANSIBLE_VERSION='latest'
- os: linux
dist: xenial
sudo: true
env: ANSIBLE_VERSION='ansible>=2.4,<2.5'
- os: linux
dist: xenial
sudo: true
env: ANSIBLE_VERSION='ansible>=2.3,<2.4'
- os: linux
dist: xenial
sudo: true
env: ANSIBLE_VERSION='latest'
- os: linux
dist: precise
sudo: true
env: ANSIBLE_VERSION='ansible>=2.4,<2.5'
- os: linux
dist: precise
sudo: true
env: ANSIBLE_VERSION='ansible>=2.3,<2.4'
- os: linux
dist: precise
sudo: true
env: ANSIBLE_VERSION='latest'

# Use the new container infrastructure
sudo: true
Expand All @@ -25,7 +52,7 @@ addons:

install:
# Install ansible
- sudo pip install ansible
- if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install $ANSIBLE_VERSION; fi

# Check ansible version
- ansible --version
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -226,3 +226,5 @@ Author Information
[ClickHouse](https://clickhouse.yandex/docs/en/index.html) by [Yandex LLC](https://yandex.ru/company/).
Role by [AlexeySetevoi](https://github.com/AlexeySetevoi).
Dear contributors, thank you.
2 changes: 1 addition & 1 deletion tasks/config_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- name: Config | Delete database config
command: "clickhouse-client -h localhost -q 'DROP DATABASE IF EXISTS `{{ item.name }}`'"
with_items: "{{ clickhouse_dbs }}"
when: item.state is defined and item.state == 'absent' and item.name in existing_databases.stdout.lines_lines
when: item.state is defined and item.state == 'absent' and item.name in existing_databases.stdout_lines
tags: [config_db]

- name: Config | Create database config
Expand Down
4 changes: 4 additions & 0 deletions tasks/config_sys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@
template:
src: config.j2
dest: "{{ clickhouse_path_configdir }}/config.xml"
owner: clickhouse
group: clickhouse
notify: restart-ch
become: true

- name: Config | Generate users config
template:
src: users.j2
dest: "{{ clickhouse_path_configdir }}/users.xml"
owner: clickhouse
group: clickhouse
notify: restart-ch
become: true

Expand Down

0 comments on commit 2701eb7

Please sign in to comment.