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

@@ -4,10 +4,6 @@ class planet {
     ensure => present
   }
 
-  package { 'nginx':
-    ensure => present
-  }
-
   file { '/srv/planet':
     ensure => directory
   }
@@ -20,9 +16,4 @@ class planet {
     ensure => directory
   }
 
-  service { "nginx":
-    ensure => running,
-    hasrestart => true
-  }
-
 }

manifests/site.pp

@@ -1,17 +1,13 @@
-define planet::site($git_url) {
+define planet::site($git_url, $vhost_name="planet.${name}.org") {
 
-  file { "/etc/nginx/sites-available/planet-${name}":
-    ensure => present,
-    content => template("planet/nginx.erb"),
-    replace => true,
-    require => Package[nginx],
-    notify => Service[nginx]
-  }
+  include apache
+  include remove_nginx
 
-  file { "/etc/nginx/sites-enabled/planet-${name}":
-    ensure => link,
-    target => "/etc/nginx/sites-available/planet-${name}",
-    require => Package[nginx],
+  apache::vhost { $vhost_name:
+    port => 80,
+    priority => '50',
+    docroot => "/srv/planet/${name}",
+    require => File["/srv/planet"],
   }
 
   vcsrepo { "/var/lib/planet/${name}":

templates/nginx.erb

@@ -1,5 +0,0 @@
-server {
-  listen 80;
-  server_name planet.<%= name %>.org;
-  root /srv/planet/<%= name %>;
-}