Mercurial > repos > other > Puppet
comparison manifests/templates.pp @ 58:65b227da8dc2 puppet-3.6
Merge Default again
(Because somehow the last one wasn't the latest default,
even though I did "hg pull -u" just before the merge)
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sun, 26 Jul 2015 17:58:06 +0100 |
| parents | 3674aac72674 be1e9773a12c |
| children | c2f66d0f2a43 |
comparison
equal
deleted
inserted
replaced
| 57:3674aac72674 | 58:65b227da8dc2 |
|---|---|
| 473 website::https::multitld { 'dev.ibboard': | 473 website::https::multitld { 'dev.ibboard': |
| 474 #Make sure we're the first one hit for the tiny fraction of "no support" cases we care about (potentially Python for Mercurial!) | 474 #Make sure we're the first one hit for the tiny fraction of "no support" cases we care about (potentially Python for Mercurial!) |
| 475 # http://en.wikipedia.org/wiki/Server_Name_Indication#No_support | 475 # http://en.wikipedia.org/wiki/Server_Name_Indication#No_support |
| 476 priority => 1, | 476 priority => 1, |
| 477 custom_fragment => template("private/apache/dev.fragment"), | 477 custom_fragment => template("private/apache/dev.fragment"), |
| 478 force_no_index => false, | |
| 478 } | 479 } |
| 479 } | 480 } |
| 480 class glittergothsite { | 481 class glittergothsite { |
| 481 website::https::multitld { 'www.glittergoth': | 482 website::https::multitld { 'www.glittergoth': |
| 482 ip => $website::secondary_ip, | 483 ip => $website::secondary_ip, |