Mercurial > repos > other > Puppet

diff modules/website/manifests/https.pp @ 155:e661cb2dd942 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make sure that we still redirect to non-www if we want it
author IBBoard <dev@ibboard.co.uk>
date Tue, 28 Mar 2017 21:05:12 +0100
parents 060f81349dd6
children d2b4750e843a
line wrap: on
line diff
--- a/modules/website/manifests/https.pp	Tue Mar 28 20:56:53 2017 +0100
+++ b/modules/website/manifests/https.pp	Tue Mar 28 21:05:12 2017 +0100
@@ -29,6 +29,11 @@
   $shortname = domain_to_short_name($name)
   $logpart = $shortname
   $shortdomain = domain_to_short_domain($name)
+  if $force_no_www {
+    $primary_name = $shortdomain
+  } else {
+    $primary_name = $name
+  }
 
   $custom_conf0 = template('website/https_core_conf.erb')