diff --git a/.fixtures.yml b/.fixtures.yml index a73b35d2..2733e4e9 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -4,5 +4,6 @@ fixtures: extlib: "git://github.com/puppet-community/puppet-extlib.git" foreman: "git://github.com/theforeman/puppet-foreman.git" common: "git://github.com/katello/puppet-common.git" + evenup: "git@github.com:evenup/evenup-trusted_ca.git" symlinks: certs: "#{source_dir}" diff --git a/manifests/katello.pp b/manifests/katello.pp index e5c43683..0e6f20f6 100644 --- a/manifests/katello.pp +++ b/manifests/katello.pp @@ -18,6 +18,12 @@ $candlepin_consumer_summary = "Subscription-manager consumer certificate for Katello instance ${::fqdn}" $candlepin_consumer_description = 'Consumer certificate and post installation script that configures rhsm.' + class { '::trusted_ca': } -> + trusted_ca::ca { 'katello_server-host-cert': + source => $certs::katello_server_ca_cert, + require => File[$certs::katello_server_ca_cert], + } + file { $katello_www_pub_dir: ensure => directory, owner => 'apache', diff --git a/metadata.json b/metadata.json index 7838cf55..06451277 100644 --- a/metadata.json +++ b/metadata.json @@ -8,6 +8,10 @@ "project_page": "https://github.com/Katello/puppet-certs", "issues_url": "http://projects.theforeman.org/projects/katello/issues", "dependencies": [ + { + "name": "evenup-trusted_ca", + "version_requirement": ">= 1.0.1 < 2.0.0" + }, { "name": "puppetlabs-stdlib", "version_requirement": ">= 4.2.0 < 5.0.0"