Migrate to puppet-httpd module
puppet-httpd is the openstack-infra version of puppetlabs-apache (0.0.4) release. This patchset will remove the puppetlabs-apache namespace from -infra allowing for possible future patchsets to use newer puppetlabs-apache modules. Change-Id: Iba588ffb565e3c27615f444efeb5a3586cafbd82 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
77d2d1b7ba
commit
fa747a6175
|
@ -28,7 +28,7 @@ class graphite(
|
||||||
'python-cairo',
|
'python-cairo',
|
||||||
'nodejs' ]
|
'nodejs' ]
|
||||||
|
|
||||||
include apache
|
include ::httpd
|
||||||
include pip
|
include pip
|
||||||
|
|
||||||
package { $packages:
|
package { $packages:
|
||||||
|
@ -104,7 +104,7 @@ class graphite(
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
owner => 'www-data',
|
owner => 'www-data',
|
||||||
group => 'www-data',
|
group => 'www-data',
|
||||||
require => [Package[$::apache::params::apache_name],
|
require => [Class['httpd'],
|
||||||
File['/var/lib/graphite']]
|
File['/var/lib/graphite']]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ class graphite(
|
||||||
ensure => directory,
|
ensure => directory,
|
||||||
owner => 'www-data',
|
owner => 'www-data',
|
||||||
group => 'www-data',
|
group => 'www-data',
|
||||||
require => Package[$::apache::params::apache_name],
|
require => Class['httpd'],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/var/log/graphite/carbon-cache-a':
|
file { '/var/log/graphite/carbon-cache-a':
|
||||||
|
@ -190,20 +190,20 @@ 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[$::apache::params::apache_name],
|
Class['httpd'],
|
||||||
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']],
|
||||||
}
|
}
|
||||||
|
|
||||||
apache::vhost { $vhost_name:
|
::httpd::vhost { $vhost_name:
|
||||||
port => 80,
|
port => 80,
|
||||||
priority => '50',
|
priority => '50',
|
||||||
docroot => '/var/lib/graphite/webapp',
|
docroot => '/var/lib/graphite/webapp',
|
||||||
template => 'graphite/graphite.vhost.erb',
|
template => 'graphite/graphite.vhost.erb',
|
||||||
}
|
}
|
||||||
|
|
||||||
a2mod { 'headers':
|
httpd_mod { 'headers':
|
||||||
ensure => present
|
ensure => present
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -266,7 +266,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[$::apache::params::apache_name]],
|
Class['httpd']],
|
||||||
}
|
}
|
||||||
|
|
||||||
file { '/etc/init.d/carbon-cache':
|
file { '/etc/init.d/carbon-cache':
|
||||||
|
|
Loading…
Reference in New Issue