Skip to content

Commit

Permalink
Move all ensure parameters from concat::fragment to concat
Browse files Browse the repository at this point in the history
Deprecated in 1.1.x and has no effect in 2.x.  From commit 1919eb3, but
was reverted when temporarily removing 2.x support in f54393e.
  • Loading branch information
domcleal committed Mar 17, 2016
1 parent a13b564 commit a2f6362
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 7 deletions.
3 changes: 0 additions & 3 deletions manifests/balancer.pp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
}

concat::fragment { "00-${name}-header":
ensure => present,
target => "apache_balancer_${name}",
order => '01',
content => "<Proxy balancer://${name}>\n",
Expand All @@ -77,14 +76,12 @@
# concat fragments. We don't have to do anything about them.

concat::fragment { "01-${name}-proxyset":
ensure => present,
target => "apache_balancer_${name}",
order => '19',
content => inline_template("<% @proxy_set.keys.sort.each do |key| %> Proxyset <%= key %>=<%= @proxy_set[key] %>\n<% end %>"),
}

concat::fragment { "01-${name}-footer":
ensure => present,
target => "apache_balancer_${name}",
order => '20',
content => "</Proxy>\n",
Expand Down
1 change: 0 additions & 1 deletion manifests/balancermember.pp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
) {

concat::fragment { "BalancerMember ${name}":
ensure => present,
target => "apache_balancer_${balancer_cluster}",
content => inline_template(" BalancerMember ${url} <%= @options.join ' ' %>\n"),
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -242,14 +242,14 @@
}

concat { $ports_file:
ensure => present,
owner => 'root',
group => $::apache::params::root_group,
mode => $::apache::file_mode,
notify => Class['Apache::Service'],
require => Package['httpd'],
}
concat::fragment { 'Apache ports header':
ensure => present,
target => $ports_file,
content => template('apache/ports_header.erb')
}
Expand Down
1 change: 0 additions & 1 deletion manifests/listen.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Template uses: $listen_addr_port
concat::fragment { "Listen ${listen_addr_port}":
ensure => present,
target => $::apache::ports_file,
content => template('apache/listen.erb'),
}
Expand Down
1 change: 0 additions & 1 deletion manifests/namevirtualhost.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

# Template uses: $addr_port
concat::fragment { "NameVirtualHost ${addr_port}":
ensure => present,
target => $::apache::ports_file,
content => template('apache/namevirtualhost.erb'),
}
Expand Down

0 comments on commit a2f6362

Please sign in to comment.