Merge "Ensure directory exists for certificates for httpd"

This commit is contained in:
Jenkins 2017-04-12 10:14:09 +00:00 committed by Gerrit Code Review
commit cb2393f6e0
3 changed files with 57 additions and 0 deletions

View File

@ -0,0 +1,55 @@
# Copyright 2017 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# : = Class: tripleo::certmonger::apache_dirs
#
# Creates the necessary directories for apache's certificates and keys in the
# assigned locations if specified. It also assigns the correct SELinux tags.
#
# === Parameters:
#
# [*certificate_dir*]
# (Optional) Directory where apache's certificates will be stored. If left
# unspecified, it won't be created.
# Defaults to undef
#
# [*key_dir*]
# (Optional) Directory where apache's keys will be stored.
# Defaults to undef
#
class tripleo::certmonger::apache_dirs(
$certificate_dir = undef,
$key_dir = undef,
){
if $certificate_dir {
file { $certificate_dir :
ensure => 'directory',
selrole => 'object_r',
seltype => 'cert_t',
seluser => 'system_u',
}
File[$certificate_dir] ~> Certmonger_certificate<| tag == 'apache-cert' |>
}
if $key_dir {
file { $key_dir :
ensure => 'directory',
selrole => 'object_r',
seltype => 'cert_t',
seluser => 'system_u',
}
File[$key_dir] ~> Certmonger_certificate<| tag == 'apache-cert' |>
}
}

View File

@ -55,6 +55,7 @@ define tripleo::certmonger::httpd (
postsave_cmd => $postsave_cmd,
ca => $certmonger_ca,
wait => true,
tag => 'apache-cert',
require => Class['::certmonger'],
}

View File

@ -68,6 +68,7 @@ class tripleo::profile::base::certmonger_user (
include ::tripleo::certmonger::ca::libvirt
unless empty($apache_certificates_specs) {
include ::tripleo::certmonger::apache_dirs
ensure_resources('tripleo::certmonger::httpd', $apache_certificates_specs)
}
unless empty($libvirt_certificates_specs) {