Merge "Use the correct name for apache"

This commit is contained in:
Jenkins 2014-06-10 19:52:51 +00:00 committed by Gerrit Code Review
commit 677df4fce1
4 changed files with 8 additions and 8 deletions
modules
cgit/manifests
graphite/manifests
lodgeit/manifests
mailman/manifests

@ -144,7 +144,7 @@ class cgit(
group => 'root',
mode => '0644',
content => template('cgit/ssl.conf.erb'),
require => Package['mod_ssl'],
require => Package[$::apache::params::ssl_package],
}
file { $cgitdir:

@ -87,7 +87,7 @@ class graphite(
ensure => directory,
owner => 'www-data',
group => 'www-data',
require => [Package['apache2'],
require => [Package[$::apache::params::apache_name],
File['/var/lib/graphite']]
}
@ -95,7 +95,7 @@ class graphite(
ensure => directory,
owner => 'www-data',
group => 'www-data',
require => Package['apache2'],
require => Package[$::apache::params::apache_name],
}
file { '/etc/graphite':
@ -110,7 +110,7 @@ class graphite(
onlyif => 'test ! -f /var/lib/graphite/storage/graphite.db',
require => [ Exec['install_graphite_web'],
File['/var/lib/graphite'],
Package['apache2'],
Package[$::apache::params::apache_name],
File['/usr/local/lib/python2.7/dist-packages/graphite/local_settings.py'],
File['/usr/local/bin/graphite-init-db.py'],
File['/etc/graphite/admin.ini']],
@ -182,7 +182,7 @@ class graphite(
group => 'www-data',
content => template('graphite/admin.ini'),
require => [ File['/etc/graphite'],
Package['apache2']],
Package[$::apache::params::apache_name]],
}
file { '/etc/init.d/carbon-cache':

@ -21,7 +21,7 @@ define lodgeit::site(
ensure => present,
content => template('lodgeit/upstart.erb'),
replace => true,
require => Package['apache2'],
require => Package[$::apache::params::apache_name],
notify => Service["${name}-paste"],
}
@ -66,6 +66,6 @@ define lodgeit::site(
service { "${name}-paste":
ensure => running,
provider => upstart,
require => Service['apache2'],
require => Service[$::apache::params::apache_name],
}
}

@ -25,7 +25,7 @@ class mailman($vhost_name=$::fqdn) {
group => 'root',
replace => true,
mode => '0444',
require => Package['apache2'],
require => Package[$::apache::params::apache_name],
}
file { '/etc/mailman/mm_cfg.py':