Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move all ensure parameters from concat::fragment to concat #1396

Merged
merged 1 commit into from Mar 18, 2016
Merged

Move all ensure parameters from concat::fragment to concat #1396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions manifests/balancer.pp
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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