opuppet/module-nginx
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #757 from brandonweeks/concat2.x

Browse source 
Supress warnings with concat 2.x
This commit is contained in:
James Fryman 2016-02-08 15:03:12 -06:00
commit 6689f3025d
2 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifests/resource/location.pp
View file

@ -379,7 +379,6 @@ define nginx::resource::location (
$location_md5 = md5($location) $location_md5 = md5($location)
if ($ssl_only != true) { if ($ssl_only != true) {
concat::fragment { "${vhost_sanitized}-${priority}-${location_md5}": concat::fragment { "${vhost_sanitized}-${priority}-${location_md5}":
ensure => $ensure_real,
target => $config_file, target => $config_file,
content => join([ content => join([
template('nginx/vhost/location_header.erb'), template('nginx/vhost/location_header.erb'),
@ -395,7 +394,6 @@ define nginx::resource::location (
$ssl_priority = $priority + 300 $ssl_priority = $priority + 300
concat::fragment { "${vhost_sanitized}-${ssl_priority}-${location_md5}-ssl": concat::fragment { "${vhost_sanitized}-${ssl_priority}-${location_md5}-ssl":
ensure => $ensure_real,
target => $config_file, target => $config_file,
content => join([ content => join([
template('nginx/vhost/location_header.erb'), template('nginx/vhost/location_header.erb'),

1
manifests/resource/upstream/member.pp
View file

@ -52,7 +52,6 @@ define nginx::resource::upstream::member (
# Uses: $server, $port, $upstream_fail_timeout # Uses: $server, $port, $upstream_fail_timeout
concat::fragment { "${upstream}_upstream_member_${name}": concat::fragment { "${upstream}_upstream_member_${name}":
ensure => $ensure_real,
target => "${::nginx::config::conf_dir}/conf.d/${upstream}-upstream.conf", target => "${::nginx::config::conf_dir}/conf.d/${upstream}-upstream.conf",
order => 40, order => 40,
content => template('nginx/conf.d/upstream_member.erb'), content => template('nginx/conf.d/upstream_member.erb'),