Skip to content

Commit a4d81c6

Browse files
committed
ncm-metaconfig: logstash: Fix certificate paths in test profile
Also add missing component include.
1 parent 754f83a commit a4d81c6

File tree

2 files changed

+5
-5
lines changed
  • ncm-metaconfig/src/main/metaconfig/logstash/1.2/tests

2 files changed

+5
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ object template server;
22

33
variable METACONFIG_LOGSTASH_VERSION = '1.2';
44

5+
include 'components/metaconfig/config';
56
include 'metaconfig/logstash/config';
67

78
prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.conf}/contents";
@@ -22,8 +23,8 @@ prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.
2223
"input/plugins" = append(dict("lumberjack", dict(
2324
"type", "lumberjack",
2425
"port", 5043,
25-
"ssl_certificate", "/software/components/ccm/cert_file",
26-
"ssl_key", "/software/components/ccm/key_file",
26+
"ssl_certificate", "/etc/pki/tls/cert.pem",
27+
"ssl_key", "/etc/pki/tls/key.pem",
2728
)));
2829

2930

@@ -113,4 +114,3 @@ prefix "/software/components/metaconfig/services/{/etc/logstash/conf.d/logstash.
113114
"port", list(9300, 9305),
114115
),
115116
)));
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

0 commit comments

Comments
 (0)