Skip to content

Commit 5de9490

Browse files
committed
ncm-metaconfig: logstash: Fix certificate paths in test profiles
1 parent 754f83a commit 5de9490

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

ncm-metaconfig/src/main/metaconfig/logstash/1.2/tests/profiles/config.pan

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
object template config;
22

33
variable METACONFIG_LOGSTASH_VERSION = '1.2';
4+
45
include 'metaconfig/logstash/config';
56

67
prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.conf}/contents/output";

ncm-metaconfig/src/main/metaconfig/logstash/1.2/tests/profiles/server.pan

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.
2222
"input/plugins" = append(dict("lumberjack", dict(
2323
"type", "lumberjack",
2424
"port", 5043,
25-
"ssl_certificate", "/software/components/ccm/cert_file",
26-
"ssl_key", "/software/components/ccm/key_file",
25+
"ssl_certificate", "/etc/pki/tls/cert.pem",
26+
"ssl_key", "/etc/pki/tls/key.pem",
2727
)));
2828

2929

@@ -113,4 +113,3 @@ prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.
113113
"port", list(9300, 9305),
114114
),
115115
)));
116-

ncm-metaconfig/src/main/metaconfig/logstash/1.2/tests/regexps/server/base

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ input \{$
1515
^\s{4}\}$
1616
^\s{4}lumberjack \{$
1717
^\s{8}type => "lumberjack"$
18-
^\s{8}ssl_certificate => "/software/components/ccm/cert_file"$
19-
^\s{8}ssl_key => "/software/components/ccm/key_file"$
18+
^\s{8}ssl_certificate => "/etc/pki/tls/cert.pem"$
19+
^\s{8}ssl_key => "/etc/pki/tls/key.pem"$
2020
^\s{8}port => 5043$
2121
^\s{4}\}$
2222
^\}$ ### COUNT 3

ncm-metaconfig/src/main/metaconfig/logstash/2.0/tests/profiles/server.pan

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.
2222
"input/plugins" = append(dict("lumberjack", dict(
2323
"type", "lumberjack",
2424
"port", 5043,
25-
"ssl_certificate", "/software/components/ccm/cert_file",
26-
"ssl_key", "/software/components/ccm/key_file",
25+
"ssl_certificate", "/etc/pki/tls/cert.pem",
26+
"ssl_key", "/etc/pki/tls/key.pem",
2727
)));
2828

2929
"input/plugins" = append(dict("beats", dict(
3030
"type", "beats",
3131
"port", 5043,
32-
"ssl_certificate", "/software/components/ccm/cert_file",
33-
"ssl_key", "/software/components/ccm/key_file",
32+
"ssl_certificate", "/etc/pki/tls/cert.pem",
33+
"ssl_key", "/etc/pki/tls/key.pem",
3434
"ssl", true,
3535
"congestion_threshold", 20,
3636
)));

ncm-metaconfig/src/main/metaconfig/logstash/5.0/tests/profiles/server.pan

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,3 @@ prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.
172172
"index", "%{[@metadata][target_index]}",
173173
),
174174
)));
175-

0 commit comments

Comments
 (0)