summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-02-17 17:40:47 -0200
committerSilvio Rhatto <rhatto@riseup.net>2010-02-17 17:40:47 -0200
commit426b3c0f28750515332dea55d0b1f55fbb2fe1ca (patch)
tree559a0bfa21d53cadb3117adc431035ba161dcf86 /manifests
parent6c19434d0e551a976a7fbe785738194946ffd415 (diff)
downloadpuppet-puppet-426b3c0f28750515332dea55d0b1f55fbb2fe1ca.tar.gz
puppet-puppet-426b3c0f28750515332dea55d0b1f55fbb2fe1ca.tar.bz2
Minor fix
Diffstat (limited to 'manifests')
-rw-r--r--manifests/puppetmasterd.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index a566ed3..556cb03 100644
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -6,7 +6,6 @@ class puppetmasterd {
'': {
$puppetmaster_servertype = 'mongrel'
$puppetmaster_daemon_opts = '--ssl_client_header=HTTP_X_SSL_SUBJECT'
- include nginx::puppetmaster
}
}
@@ -42,6 +41,8 @@ class puppetmasterd {
case $puppetmaster_servertype {
'mongrel': {
+ include nginx::puppetmaster
+
case defined(Package["mongrel"]) {
false: { package { "mongrel": ensure => installed, } }
}