opendev/puppet-ethercalc
Code Issues Proposed changes

Add connection-tuning file to new Apache 2.4 conf folder structure

Browse Source 
This change enables this manifest on Ubuntu Trusty, as it comes
with Apache 2.4 by default and there's no longer conf.d folder, it
is split on conf.available/conf.enable.

Change-Id: I7986e3f3be97f3448b743789a2c4fdacd07a20a8
This commit is contained in:
Ricardo Carrillo Cruz 2015-01-30 14:47:54 +00:00
parent 7eec04a01b
commit 88dd268c4a
1 changed files with 25 additions and 7 deletions

32
manifests/apache.pp

@ -32,13 +32,31 @@ class etherpad_lite::apache (
a2mod { 'proxy_http':
ensure => present,
}
file { '/etc/apache2/conf.d/connection-tuning':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/etherpad_lite/apache-connection-tuning',
notify => Service['httpd'],
if ($::lsbdistcodename == 'precise') {
file { '/etc/apache2/conf.d/connection-tuning':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/etherpad_lite/apache-connection-tuning',
notify => Service['httpd'],
}
} else {
file { '/etc/apache2/conf-available/connection-tuning':
ensure => present,
owner => 'root',
group => 'root',
mode => '0644',
source => 'puppet:///modules/etherpad_lite/apache-connection-tuning',
}
file { '/etc/apache2/conf-enabled/connection-tuning':
ensure => link,
target => '/etc/apache2/conf-available/connection-tuning',
notify => Service['httpd'],
require => File['/etc/apache2/conf-available/connection-tuning'],
}
}
file { '/etc/ssl/certs':