summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-24 09:23:54 +0200
committervarac <varacanero@zeromail.org>2013-09-24 10:06:22 +0200
commit9fae612bd8d147321e0cb553610fcaf0140e84eb (patch)
treef29a4d75a88595795aca90323e1d34ce7586210d /puppet/modules/site_webapp/manifests
parentffa4504f81c0abecc62b068951ec147741028128 (diff)
move commercial x509 deployment to site_x509 (Feature #3889)
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-rw-r--r--puppet/modules/site_webapp/manifests/apache.pp35
1 files changed, 6 insertions, 29 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 062344d7..6a199b9e 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -7,20 +7,14 @@ class site_webapp::apache {
$web_domain = hiera('domain')
$domain_name = $web_domain['name']
- $x509 = hiera('x509')
- $commercial_key = $x509['commercial_key']
- $commercial_cert = $x509['commercial_cert']
- $commercial_root = $x509['commercial_ca_cert']
-
- include site_config::x509::cert
- include site_config::x509::key
- include site_config::x509::ca
-
include x509::variables
+ include site_config::x509::commercial::cert
+ include site_config::x509::commercial::key
+ include site_config::x509::commercial::ca
- X509::Cert[$site_config::params::cert_name] ~> Service[apache]
- X509::Key[$site_config::params::cert_name] ~> Service[apache]
- X509::Ca[$site_config::params::ca_name] ~> Service[apache]
+ Class['Site_config::X509::Commercial::Key'] ~> Service[apache]
+ Class['Site_config::X509::Commercial::Cert'] ~> Service[apache]
+ Class['Site_config::X509::Commercial::Ca'] ~> Service[apache]
class { '::apache': no_default_site => true, ssl => true }
@@ -40,21 +34,4 @@ class site_webapp::apache {
content => template('site_apache/vhosts.d/api.conf.erb')
}
- x509::key {
- 'leap_webapp':
- content => $commercial_key,
- notify => Service[apache];
- }
-
- x509::cert {
- 'leap_webapp':
- content => $commercial_cert,
- notify => Service[apache];
- }
-
- x509::ca {
- 'leap_webapp':
- content => $commercial_root,
- notify => Service[apache];
- }
}