summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2013-09-22 00:13:13 +0200
committerkwadronaut <kwadronaut@leap.se>2013-09-22 00:13:13 +0200
commit5e582cbf9e2cd135009965433b4cd2a7747732ed (patch)
treedd1c2f5f2acb4efd4d529b9fc66c3606e57fd397 /puppet/modules/site_webapp
parentd7f5b368547f37cfa53cd606f3d72fab44b6bd7f (diff)
parenta95e00f78e07d515b49de563ca5fbcd83be0d015 (diff)
Merge branch 'api-crt-3384' into develop fixes #3384
Diffstat (limited to 'puppet/modules/site_webapp')
-rw-r--r--puppet/modules/site_webapp/manifests/apache.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp
index 3dd1c4c7..d604b00f 100644
--- a/puppet/modules/site_webapp/manifests/apache.pp
+++ b/puppet/modules/site_webapp/manifests/apache.pp
@@ -4,6 +4,9 @@ class site_webapp::apache {
$api_domain = $web_api['domain']
$api_port = $web_api['port']
+ $web_domain = hiera('domain')
+ $domain_name = $web_domain['name']
+
$x509 = hiera('x509')
$commercial_key = $x509['commercial_key']
$commercial_cert = $x509['commercial_cert']