summaryrefslogtreecommitdiff
path: root/puppet/modules/site_webapp/manifests
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2013-09-17 20:09:10 +0200
committerkwadronaut <kwadronaut@leap.se>2013-09-22 00:08:05 +0200
commita95e00f78e07d515b49de563ca5fbcd83be0d015 (patch)
tree809319f17cf2c3505668d92f2813787791412bf2 /puppet/modules/site_webapp/manifests
parent70284fd0e786ad838fbbd40c816f6c0d01cc1629 (diff)
adding fqdn as default servername and moving service.domain to ServerAlias (fixing #3384)
node name and dns fqdn could be different Also note that on local deploys that warning from #3384 will continue to exist (because of dns)
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-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 4331afe4..3d28ec83 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']