From 6f1632690551da7118d4856389c0c033c7d15ce0 Mon Sep 17 00:00:00 2001 From: joschneid Date: Thu, 24 Jan 2019 08:42:57 +0100 Subject: [PATCH] debian repo keys with pgp keyserver --- roles/elastic-stack/ansible-elasticsearch/defaults/main.yml | 4 ++++ roles/elastic-stack/ansible-kibana/defaults/main.yml | 4 ++++ roles/elastic-stack/ansible-logstash/defaults/main.yml | 4 ++++ roles/wazuh/ansible-filebeat/defaults/main.yml | 4 ++++ roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 4 ++++ roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 5 +++++ 6 files changed, 25 insertions(+) diff --git a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml index ef5e02cd..c36a9ef1 100644 --- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml +++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml @@ -8,5 +8,9 @@ elastic_stack_version: 6.5.4 elasticsearch_shards: 5 elasticsearch_replicas: 1 elasticsearch_install_java: yes +<<<<<<< HEAD elasticrepo_gpg_keyserver: pool.sks-keyservers.net elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt +======= +elasticrepo_gpg_keyserver: pgp.mit.edu +>>>>>>> debian repo keys with pgp keyserver diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index 2b02b8b4..88893f0c 100644 --- a/roles/elastic-stack/ansible-kibana/defaults/main.yml +++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml @@ -5,7 +5,11 @@ kibana_server_host: "0.0.0.0" kibana_server_port: "5601" elastic_stack_version: 6.5.4 wazuh_version: 3.8.2 +<<<<<<< HEAD elasticrepo_gpg_keyserver: pool.sks-keyservers.net elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt wazuhapp_location: https://packages.wazuh.com/wazuhapp +======= +elasticrepo_gpg_keyserver: pgp.mit.edu +>>>>>>> debian repo keys with pgp keyserver diff --git a/roles/elastic-stack/ansible-logstash/defaults/main.yml b/roles/elastic-stack/ansible-logstash/defaults/main.yml index 0be1cc56..fdc11b82 100644 --- a/roles/elastic-stack/ansible-logstash/defaults/main.yml +++ b/roles/elastic-stack/ansible-logstash/defaults/main.yml @@ -18,5 +18,9 @@ logstash_ssl_key_file: "" logstash_install_java: yes +<<<<<<< HEAD elasticrepo_gpg_keyserver: pool.sks-keyservers.net elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt +======= +elasticrepo_gpg_keyserver: pgp.mit.edu +>>>>>>> debian repo keys with pgp keyserver diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml index 5f3023c1..c41838a1 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -28,5 +28,9 @@ filebeat_ssl_certificate_file: "" filebeat_ssl_key_file: "" filebeat_ssl_insecure: "false" +<<<<<<< HEAD elasticrepo_gpg_keyserver: pool.sks-keyservers.net elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt +======= +elasticrepo_gpg_keyserver: pgp.mit.edu +>>>>>>> debian repo keys with pgp keyserver diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 069d1905..77b38746 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -306,5 +306,9 @@ wazuh_agent_config: - key: Env value: Production +<<<<<<< HEAD wauzhrepo_gpg_keyserver: pool.sks-keyservers.net wazuhrepo_server: https://packages.wazuh.com/3.x/apt/ +======= +wauzhrepo_gpg_keyserver: pgp.mit.edu +>>>>>>> debian repo keys with pgp keyserver diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 66f46837..9f05f727 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -330,7 +330,12 @@ wazuh_agent_configs: - location: 'System' format: 'eventlog' +<<<<<<< HEAD wauzhrepo_gpg_keyserver: pool.sks-keyservers.net nodejsrepo_gpg_keyserver: pool.sks-keyservers.net wazuhrepo_server: https://packages.wazuh.com/3.x/apt/ nodejsrepo_server: https://deb.nodesource.com/node_6.x +======= +wauzhrepo_gpg_keyserver: pgp.mit.edu +nodejsrepo_gpg_keyserver: pgp.mit.edu +>>>>>>> debian repo keys with pgp keyserver