Skip to content

Commit 0f957ad

Browse files
Fix #40
1 parent 0dd09a8 commit 0f957ad

File tree

4 files changed

+0
-19
lines changed

4 files changed

+0
-19
lines changed

docs/role-logstash.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ Aside from `logstash.yml` we can manage Logstashs pipelines.
5555
* *logstash_beats_input*: Enable default pipeline with `beats` input (default: `true`)
5656
* *logstash_beats_input_congestion*: Optional congestion threshold for the beats input pipeline
5757
* *logstash_beats_tls*: Activate TLS for the beats input pipeline (default: none but `true` with full stack setup if not set)
58-
* *logstash_beats_tls_encryptkey*: Enable encryption of key for beats input - disabling used as a workaround on certain hosts (default: true)
5958
* *logstash_tls_key_passphrase*: Passphrase for Logstash certificates (default: `ChangeMe`)
6059
* *logstash_elasticsearch*: Address of Elasticsearch instance for default output (default: list of Elasticsearch nodes from `elasticsearch` role or `localhost` when used standalone)
6160
* *logstash_security*: Enable X-Security (No default set, but will be activated when in full stack mode)

roles/logstash/defaults/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ logstash_pipelines:
3535
# source: https://github.com/widhalmt/shipper-logstash-pipeline.git
3636
logstash_elasticsearch_output: true
3737
logstash_beats_input: true
38-
logstash_beats_tls_encryptkey: true
3938

4039
# logstash security
4140
logstash_user: logstash_writer

roles/logstash/tasks/logstash-security.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,18 +125,6 @@
125125
tags:
126126
- certificates
127127

128-
- name: Create Logstash compatible key
129-
command: >
130-
openssl pkcs8
131-
-in {{ logstash_certs_dir }}/{{ inventory_hostname }}.key
132-
-topk8
133-
-passin pass:{{ logstash_tls_key_passphrase }}
134-
-out {{ logstash_certs_dir }}/{{ inventory_hostname }}-pkcs8.key
135-
-passout pass:{{ logstash_tls_key_passphrase }}
136-
args:
137-
creates: "{{ logstash_certs_dir }}/{{ inventory_hostname }}-pkcs8.key"
138-
when: logstash_beats_tls_encryptkey | bool
139-
140128
- name: Create unencrypted Logstash compatible key
141129
command: >
142130
openssl pkcs8
@@ -147,7 +135,6 @@
147135
-nocrypt
148136
args:
149137
creates: "{{ logstash_certs_dir }}/{{ inventory_hostname }}-pkcs8.key"
150-
when: not logstash_beats_tls_encryptkey | bool
151138

152139
- name: Set permissions on Logstash key
153140
file:

roles/logstash/templates/beats-input.conf.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ input {
88
ssl_verify_mode => force_peer
99
ssl_certificate_authorities => ["{{ logstash_certs_dir }}/ca.crt"]
1010
ssl_peer_metadata => false
11-
{% if logstash_beats_tls_encryptkey | bool %}
12-
ssl_key_passphrase => "{{ logstash_tls_key_passphrase }}"
1311
{% endif %}
14-
{% endif %}
15-
1612
}
1713
}

0 commit comments

Comments
 (0)