|
32 | 32 | # ['puppetdb_startup_timeout'] - The timeout for puppetdb
|
33 | 33 | # ['dns_alt_names'] - Comma separated list of alternative DNS names
|
34 | 34 | # ['digest_algorithm'] - The algorithm to use for file digests.
|
| 35 | +# ['manage_webserver'] - if undef we won't install any webserver in front of puppet |
35 | 36 | #
|
36 | 37 | # Requires:
|
37 | 38 | #
|
|
83 | 84 | $puppetdb_strict_validation = $::puppet::params::puppetdb_strict_validation,
|
84 | 85 | $dns_alt_names = ['puppet'],
|
85 | 86 | $digest_algorithm = $::puppet::params::digest_algorithm,
|
| 87 | + $manage_webserver = false, |
86 | 88 | ) inherits puppet::params {
|
87 | 89 |
|
88 | 90 | anchor { 'puppet::master::begin': }
|
|
118 | 120 | ensure => $version,
|
119 | 121 | }
|
120 | 122 | }
|
121 |
| - |
| 123 | + if $manage_webserver != false { |
122 | 124 | 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 | + } -> |
133 | 135 | Anchor['puppet::master::end']
|
134 |
| - |
| 136 | + } |
135 | 137 | service { $puppet_master_service:
|
136 | 138 | ensure => stopped,
|
137 | 139 | enable => false,
|
|
0 commit comments