Skip to content

Commit e225e4f

Browse files
committed
fixing the sslhostconfig tag
1 parent c86ed79 commit e225e4f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

manifests/config/server/connector.pp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,14 @@
103103
$sslhostconfig_path = "Server/Service/Connector[#attribute/port='${port}']"
104104

105105
$_sslhostconfig_changes = [
106-
"set ${sslhostconfig_path}/Certificate/#attribute/certificateKeyFile ${cert_key_file}",
107-
"set ${sslhostconfig_path}/Certificate/#attribute/certificateFile ${cert_file}",
108-
"set ${sslhostconfig_path}/Certificate/#attribute/certificateChainFile ${cert_chain_file}",
109-
"set ${sslhostconfig_path}/Certificate/#attribute/type ${cert_type}",
106+
"set ${sslhostconfig_path}/SSLHostConfig/Certificate/#attribute/certificateKeyFile ${cert_key_file}",
107+
"set ${sslhostconfig_path}/SSLHostConfig/Certificate/#attribute/certificateFile ${cert_file}",
108+
"set ${sslhostconfig_path}/SSLHostConfig/Certificate/#attribute/certificateChainFile ${cert_chain_file}",
109+
"set ${sslhostconfig_path}/SSLHostConfig/Certificate/#attribute/type ${cert_type}",
110110
]
111111
} else {
112112
$_sslhostconfig_changes = undef
113+
notice('No certificate parameters provided, skipping SSLHostConfig configuration')
113114
}
114115

115116
if ! empty(any2array($attributes_to_remove)) {

spec/defines/config/server/connector_spec.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
end
3939

4040
sslhostconfig_changes = [
41-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/certificateKeyFile /path/to/cert.key",
42-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/certificateFile /path/to/cert.pem",
43-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/certificateChainFile /path/to/chain.pem",
44-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/type RSA",
41+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/certificateKeyFile /path/to/cert.key",
42+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/certificateFile /path/to/cert.pem",
43+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/certificateChainFile /path/to/chain.pem",
44+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/type RSA",
4545
]
4646

4747
changes = [
@@ -85,10 +85,10 @@
8585
end
8686

8787
sslhostconfig_changes = [
88-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/certificateKeyFile /path/to/cert.key",
89-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/certificateFile /path/to/cert.pem",
90-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/certificateChainFile /path/to/chain.pem",
91-
"set Server/Service/Connector[#attribute/port='8180']/Certificate/#attribute/type RSA",
88+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/certificateKeyFile /path/to/cert.key",
89+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/certificateFile /path/to/cert.pem",
90+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/certificateChainFile /path/to/chain.pem",
91+
"set Server/Service/Connector[#attribute/port='8180']/SSLHostConfig/Certificate/#attribute/type RSA",
9292
]
9393

9494
changes = [

0 commit comments

Comments
 (0)