Skip to content

Commit 291d552

Browse files
author
Tim Meusel
committed
added manage_webserver param
1 parent 504e30e commit 291d552

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

manifests/master.pp

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
# ['puppetdb_startup_timeout'] - The timeout for puppetdb
3333
# ['dns_alt_names'] - Comma separated list of alternative DNS names
3434
# ['digest_algorithm'] - The algorithm to use for file digests.
35+
# ['manage_webserver'] - if undef we won't install any webserver in front of puppet
3536
#
3637
# Requires:
3738
#
@@ -83,6 +84,7 @@
8384
$puppetdb_strict_validation = $::puppet::params::puppetdb_strict_validation,
8485
$dns_alt_names = ['puppet'],
8586
$digest_algorithm = $::puppet::params::digest_algorithm,
87+
$manage_webserver = false,
8688
) inherits puppet::params {
8789

8890
anchor { 'puppet::master::begin': }
@@ -118,20 +120,20 @@
118120
ensure => $version,
119121
}
120122
}
121-
123+
if $manage_webserver != false {
122124
Anchor['puppet::master::begin'] ->
123-
class {'puppet::passenger':
124-
puppet_passenger_port => $puppet_passenger_port,
125-
puppet_docroot => $puppet_docroot,
126-
apache_serveradmin => $apache_serveradmin,
127-
puppet_conf => $::puppet::params::puppet_conf,
128-
puppet_ssldir => $puppet_ssldir,
129-
certname => $certname,
130-
conf_dir => $::puppet::params::confdir,
131-
dns_alt_names => join($dns_alt_names,','),
132-
} ->
125+
class {'puppet::passenger':
126+
puppet_passenger_port => $puppet_passenger_port,
127+
puppet_docroot => $puppet_docroot,
128+
apache_serveradmin => $apache_serveradmin,
129+
puppet_conf => $::puppet::params::puppet_conf,
130+
puppet_ssldir => $puppet_ssldir,
131+
certname => $certname,
132+
conf_dir => $::puppet::params::confdir,
133+
dns_alt_names => join($dns_alt_names,','),
134+
} ->
133135
Anchor['puppet::master::end']
134-
136+
}
135137
service { $puppet_master_service:
136138
ensure => stopped,
137139
enable => false,

0 commit comments

Comments
 (0)