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

@@ -1,5 +1,7 @@
 class meetbot {
 
+  include apache
+
   vcsrepo { "/opt/meetbot":
     ensure => latest,
     provider => git,

manifests/site.pp

@@ -1,17 +1,11 @@
-define meetbot::site($nick, $nickpass, $network, $server, $url=$fqdn, $channels, $use_ssl) {
+define meetbot::site($nick, $nickpass, $network, $server, $vhost_name=$fqdn, $channels, $use_ssl) {
 
-  file { "/etc/nginx/sites-available/${name}-meetbot":
-    ensure => 'present',
-    content => template("meetbot/nginx.erb"),
-    replace => 'true',
-    require => Package[nginx],
-    notify => Service[nginx]
-  }
+  include remove_nginx
 
-  file { "/etc/nginx/sites-enabled/${name}-meetbot":
-    ensure => link,
-    target => "/etc/nginx/sites-available/${name}-meetbot",
-    require => Package[nginx]
+  apache::vhost { $vhost_name:
+    port => 80,
+    docroot => "/srv/meetbot-$name",
+    priority => '50',
   }
 
   file { "/var/lib/meetbot/${name}":

templates/nginx.erb

@@ -1,19 +0,0 @@
-server {
-  listen 80;
-  server_name <%= url %>;
-  root /srv/meetbot-<%= name %>;
-
-  types {
-    text/plain log;
-    text/plain txt;
-    text/html  html;
-  }
-
-  location /meetings {
-    autoindex on;
-  }
-
-  location /irclogs {
-    autoindex on;
-  }
-}