opendev/system-config
Code Issues Proposed changes

Finish switching nginx to apache2 on paste.

Browse Source 
Change-Id: I9bb04bfd3c228eff636316dc3b79098ca801cbaa
Reviewed-on: https://review.openstack.org/29012
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-05-13 15:47:47 -07:00 committed by Jenkins
parent 7f7a96ca96
commit e6483da48f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ define lodgeit::site(
$vhost_name="paste.${name}.org",
$image='') {
include remove_nginx
include apache
apache::vhost::proxy { $vhost_name:
port => 80,
@ -18,7 +18,7 @@ define lodgeit::site(
ensure => present,
content => template('lodgeit/upstart.erb'),
replace => true,
require => Package['nginx'],
require => Package['apache2'],
notify => Service["${name}-paste"],
}
@ -77,6 +77,6 @@ define lodgeit::site(
service { "${name}-paste":
ensure => running,
provider => upstart,
require => [Service['drizzle', 'nginx'], Exec["create_database_${name}"]],
require => [Service['drizzle', 'apache2'], Exec["create_database_${name}"]],
}
}