From 361495ea07d6f1a03cf6306a0cc487e3d88c9e16 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 4 Aug 2012 13:10:26 -0500
Subject: [PATCH] Align all web server usage on apache module.

Change-Id: Idd712a8ee5ec81c6b88b7d3e2270dce4da254927
Reviewed-on: https://review.openstack.org/10838
Approved: Monty Taylor <mordred@inaugust.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
---
 manifests/init.pp   | 11 +++++++++--
 manifests/site.pp   | 18 ++++++------------
 templates/nginx.erb | 10 ----------
 3 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 templates/nginx.erb

diff --git a/manifests/init.pp b/manifests/init.pp
index f85ddf7..bfe9d20 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,5 @@
 class lodgeit {
-  $packages = [ "nginx",
-                "python-imaging",
+  $packages = [ "python-imaging",
                 "python-jinja2",
                 "python-pybabel",
                 "python-werkzeug",
@@ -9,7 +8,15 @@ class lodgeit {
                 "drizzle",
                 "python-mysqldb" ]
 
+  include apache
+
   include pip
+  a2mod { 'proxy':
+    ensure => present
+  }
+  a2mod { 'proxy_http':
+    ensure => present
+  }
 
   package { $packages: ensure => present }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 031551f..82f57d7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1,17 +1,11 @@
-define lodgeit::site($port, $image="") {
+define lodgeit::site($vhost_name="paste.$name.org", $port, $image="") {
 
-  file { "/etc/nginx/sites-available/${name}":
-    ensure => 'present',
-    content => template("lodgeit/nginx.erb"),
-    replace => 'true',
-    require => Package[nginx],
-    notify => Service[nginx]
-  }
+  include remove_nginx
 
-  file { "/etc/nginx/sites-enabled/${name}":
-    ensure => link,
-    target => "/etc/nginx/sites-available/${name}",
-    require => Package[nginx]
+  apache::vhost::proxy { $vhost_name:
+    port => 80,
+    dest => "http://localhost:$port",
+    require => File["/srv/lodgeit/${name}"],
   }
 
   file { "/etc/init/${name}-paste.conf":
diff --git a/templates/nginx.erb b/templates/nginx.erb
deleted file mode 100644
index 13223fd..0000000
--- a/templates/nginx.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-server {
-  listen 80;
-  server_name paste.<%= name %>.org;
-  root /srv/lodgeit/<%= name %>;
-
-  location / {
-    proxy_pass http://localhost:<%= port %>/;
-  }
-}
-