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

Do not hardcode keyserver and key #5

Merged
merged 1 commit into from
Dec 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tasks/install_apt.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#Main installation actions
#https://clickhouse.yandex/docs/en/getting_started/index.html#installation

- name: Install by APT | Apt-key add yandex repo key
- name: Install by APT | Apt-key add repo key
apt_key:
keyserver: keyserver.ubuntu.com
id: E0C56BD4
keyserver: "{{ clickhouse_repo_keyserver }}"
id: "{{ clickhouse_repo_key }}"
become: true

- name: Install by APT | Repo installation
Expand Down
6 changes: 3 additions & 3 deletions tasks/remove_apt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
state: absent
become: true

- name: Uninstall by APT | Apt-key remove yandex repo key
- name: Uninstall by APT | Apt-key remove repo key
apt_key:
keyserver: keyserver.ubuntu.com
id: E0C56BD4
keyserver: "{{ clickhouse_repo_keyserver }}"
id: "{{ clickhouse_repo_key }}"
state: absent
become: true

Expand Down
2 changes: 2 additions & 0 deletions vars/Ubuntu_precise.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
clickhouse_supported: yes
clickhouse_repo_keyserver: keyserver.ubuntu.com
clickhouse_repo_key: E0C56BD4
clickhouse_repo: "deb http://repo.yandex.ru/clickhouse/precise stable main"
clickhouse_package:
- clickhouse-client
Expand Down
2 changes: 2 additions & 0 deletions vars/Ubuntu_trusty.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
clickhouse_supported: yes
clickhouse_repo_keyserver: keyserver.ubuntu.com
clickhouse_repo_key: E0C56BD4
clickhouse_repo: "deb http://repo.yandex.ru/clickhouse/trusty stable main"
clickhouse_package:
- clickhouse-client
Expand Down
2 changes: 2 additions & 0 deletions vars/Ubuntu_xenial.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
clickhouse_supported: yes
clickhouse_repo_keyserver: keyserver.ubuntu.com
clickhouse_repo_key: E0C56BD4
clickhouse_repo: "deb http://repo.yandex.ru/clickhouse/xenial stable main"
clickhouse_package:
- clickhouse-client
Expand Down