File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 309
309
value => $puppet_ssldir ,
310
310
}
311
311
}
312
-
312
+
313
313
if $show_diff != undef {
314
314
ini_setting {'puppetagentshow_diff' :
315
315
ensure => present ,
447
447
}
448
448
} else {
449
449
ini_setting {'puppetagentconfigtimeout' :
450
- setting => ' configtimeout' ,
451
450
ensure => absent ,
451
+ setting => ' configtimeout' ,
452
452
}
453
453
ini_setting {'puppetagentstringifyfacts' :
454
- setting => ' stringify_facts' ,
455
454
ensure => absent ,
455
+ setting => ' stringify_facts' ,
456
456
}
457
457
}
458
458
if $verbose != undef {
Original file line number Diff line number Diff line change 40
40
# Only used when environments == directory
41
41
$environmentpath = " ${confdir} /environments"
42
42
43
- if versioncmp($::puppetversion , " 4.0.0" ) >= 0 {
43
+ if versioncmp($::puppetversion , " 4.0.0" ) >= 0 {
44
44
$puppet_conf = ' /etc/puppetlabs/puppet/puppet.conf'
45
45
$puppet_run_command = ' /opt/puppetlabs/bin/puppet agent --no-daemonize --onetime --logdest syslog > /dev/null 2>&1'
46
46
$puppet_vardir = ' /opt/puppetlabs/server/data/puppetserver'
Original file line number Diff line number Diff line change 32
32
# }
33
33
#
34
34
class puppet::passenger (
35
- $generate_ssl_certs = true ,
36
35
$puppet_passenger_port,
37
36
$puppet_passenger_ssl_protocol,
38
37
$puppet_passenger_ssl_cipher,
39
- $puppet_passenger_tempdir = false ,
40
38
$puppet_docroot,
41
39
$apache_serveradmin,
42
40
$puppet_conf,
43
41
$puppet_ssldir,
44
42
$certname,
45
43
$conf_dir,
46
44
$dns_alt_names,
45
+ $passenger_root,
46
+ $generate_ssl_certs = true ,
47
+ $puppet_passenger_tempdir = false ,
47
48
$config_addon = ' ' ,
48
49
$passenger_max_pool_size = 6,
49
50
$passenger_high_performance = ' off' ,
50
51
$passenger_max_requests = 0,
51
52
$passenger_stat_throttle_rate = 10,
52
- $passenger_root,
53
53
$passenger_disable_mod_status = true ,
54
54
){
55
55
202
202
value => ' SSL_CLIENT_VERIFY' ,
203
203
require => File [$puppet_conf ],
204
204
}
205
- }
205
+ }
You can’t perform that action at this time.
0 commit comments