nuageinit: install certs in /usr/share/certs/trusted
Suggested by: kevans
This commit is contained in:
@@ -572,7 +572,7 @@ local function ca_certs(obj)
|
||||
if obj.ca_certs == nil then return end
|
||||
local trusted = obj.ca_certs.trusted
|
||||
if trusted == nil or #trusted == 0 then return end
|
||||
local certdir = root .. "/etc/ssl/certs"
|
||||
local certdir = root .. "/usr/share/certs/trusted"
|
||||
nuage.mkdir_p(certdir)
|
||||
for i, cert in ipairs(trusted) do
|
||||
local certpath = certdir .. "/nuageinit-" .. i .. ".pem"
|
||||
|
||||
@@ -276,7 +276,7 @@ The following keys are recognized:
|
||||
.It trusted
|
||||
A list of PEM-encoded CA certificates to add to the system trust store.
|
||||
Certificates are written to
|
||||
.Pa /etc/ssl/certs/
|
||||
.Pa /usr/share/certs/trusted/
|
||||
and
|
||||
.Xr certctl 8
|
||||
rehash is executed.
|
||||
|
||||
@@ -1275,8 +1275,8 @@ ca_certs:
|
||||
-----END CERTIFICATE-----
|
||||
EOF
|
||||
atf_check -o empty /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2
|
||||
atf_check -o match:"dGVzdGNlcnQx" cat etc/ssl/certs/nuageinit-1.pem
|
||||
atf_check -o match:"dGVzdGNlcnQy" cat etc/ssl/certs/nuageinit-2.pem
|
||||
atf_check -o match:"dGVzdGNlcnQx" cat usr/share/certs/trusted/nuageinit-1.pem
|
||||
atf_check -o match:"dGVzdGNlcnQy" cat usr/share/certs/trusted/nuageinit-2.pem
|
||||
true
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user