Skip to content

Commit

Permalink
Merge pull request voxpupuli#757 from brandonweeks/concat2.x
Browse files Browse the repository at this point in the history
Supress warnings with concat 2.x
  • Loading branch information
jfryman committed Feb 8, 2016
2 parents 318b147 + f7c4451 commit d2496ce
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions manifests/resource/location.pp
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,6 @@
$location_md5 = md5($location)
if ($ssl_only != true) {
concat::fragment { "${vhost_sanitized}-${priority}-${location_md5}":
ensure => $ensure_real,
target => $config_file,
content => join([
template('nginx/vhost/location_header.erb'),
Expand All @@ -395,7 +394,6 @@
$ssl_priority = $priority + 300

concat::fragment { "${vhost_sanitized}-${ssl_priority}-${location_md5}-ssl":
ensure => $ensure_real,
target => $config_file,
content => join([
template('nginx/vhost/location_header.erb'),
Expand Down
1 change: 0 additions & 1 deletion manifests/resource/upstream/member.pp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@

# Uses: $server, $port, $upstream_fail_timeout
concat::fragment { "${upstream}_upstream_member_${name}":
ensure => $ensure_real,
target => "${::nginx::config::conf_dir}/conf.d/${upstream}-upstream.conf",
order => 40,
content => template('nginx/conf.d/upstream_member.erb'),
Expand Down

0 comments on commit d2496ce

Please sign in to comment.