opendev/system-config
Code Issues Proposed changes

Use the correct name for apache

Browse Source 
The name of the apache package and service are different on different
operating systems. Fortunately, the apache module populates a variable
with the correct name for us. This is also true of the apache ssl
package.

Change-Id: I7d93e56281f828cba9262c135b0beb43dce9748a
This commit is contained in:
K Jonathan Harker 2014-06-04 17:27:48 -07:00
parent b5c62380f8
commit 5f58803b8d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cgit/manifests/init.pp
View File

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

8
modules/graphite/manifests/init.pp
View File

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

4
modules/lodgeit/manifests/site.pp
View File

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

2
modules/mailman/manifests/init.pp
View File

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