opendev/puppet-ethercalc
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2015-02-06 21:50:15 +00:00 committed by Gerrit Code Review
commit 1fcff4d473
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
manifests/apache.pp
View File

@ -32,13 +32,31 @@ class etherpad_lite::apache (
a2mod { 'proxy_http': a2mod { 'proxy_http':
ensure => present, ensure => present,
} }
file { '/etc/apache2/conf.d/connection-tuning':
ensure => present, if ($::lsbdistcodename == 'precise') {
owner => 'root', file { '/etc/apache2/conf.d/connection-tuning':
group => 'root', ensure => present,
mode => '0644', owner => 'root',
source => 'puppet:///modules/etherpad_lite/apache-connection-tuning', group => 'root',
notify => Service['httpd'], 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': file { '/etc/ssl/certs':