diff --git a/modules/meetbot/manifests/site.pp b/modules/meetbot/manifests/site.pp
index ff4fa088c5..13cd050357 100644
--- a/modules/meetbot/manifests/site.pp
+++ b/modules/meetbot/manifests/site.pp
@@ -5,7 +5,8 @@ define meetbot::site(
   $nickpass,
   $server,
   $use_ssl,
-  $vhost_name = $::fqdn
+  $vhost_name = $::fqdn,
+  $vhost_extra = '',
 ) {
 
   $varlib = "/var/lib/meetbot/${name}"
diff --git a/modules/meetbot/templates/vhost.erb b/modules/meetbot/templates/vhost.erb
index a137d57ad7..3aa3e18a2b 100644
--- a/modules/meetbot/templates/vhost.erb
+++ b/modules/meetbot/templates/vhost.erb
@@ -22,6 +22,8 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
     allow from all
   </Directory>
 
+<%= vhost_extra %>
+
   ErrorLog /var/log/apache2/<%= name %>_error.log
   LogLevel warn
   CustomLog /var/log/apache2/<%= name %>_access.log combined
diff --git a/modules/openstack_project/manifests/eavesdrop.pp b/modules/openstack_project/manifests/eavesdrop.pp
index f58e145103..3959b8d04d 100644
--- a/modules/openstack_project/manifests/eavesdrop.pp
+++ b/modules/openstack_project/manifests/eavesdrop.pp
@@ -1,3 +1,5 @@
+# Eavesdrop server
+
 class openstack_project::eavesdrop (
   $nickpass = '',
   $sysadmins = [],
@@ -15,14 +17,23 @@ class openstack_project::eavesdrop (
     iptables_public_tcp_ports => [80],
     sysadmins                 => $sysadmins
   }
+  include apache
   include meetbot
 
+  $vhost_extra = '
+  <Location /var/lib/statusbot/www >
+    Header set Access-Control-Allow-Origin "*"
+  </Location>
+  '
+
   meetbot::site { 'openstack':
-    nick      => 'openstack',
-    nickpass  => $nickpass,
-    network   => 'FreeNode',
-    server    => 'chat.freenode.net:7000',
-    channels  => [
+    nick        => 'openstack',
+    nickpass    => $nickpass,
+    network     => 'FreeNode',
+    server      => 'chat.freenode.net:7000',
+    use_ssl     => 'True',
+    vhost_extra => $vhost_extra,
+    channels    => [
         '#heat',
         '#openstack',
         '#openstack-ceilometer',
@@ -41,7 +52,6 @@ class openstack_project::eavesdrop (
         '#storyboard',
         '#tripleo',
     ],
-    use_ssl   => 'True'
   }
 
   class { 'statusbot':
@@ -55,6 +65,14 @@ class openstack_project::eavesdrop (
     wiki_url      => $statusbot_wiki_url,
     wiki_pageid   => $statusbot_wiki_pageid,
   }
-}
 
-# vim:sw=2:ts=2:expandtab:textwidth=79
+  file { '/srv/meetbot-openstack/alert':
+    ensure  => link,
+    target  => '/var/lib/statusbot/www',
+    require => Class['statusbot'],
+  }
+
+  a2mod { 'headers':
+    ensure => present,
+  }
+}
diff --git a/modules/statusbot/manifests/init.pp b/modules/statusbot/manifests/init.pp
index 6d6d114b30..a562ba3b34 100644
--- a/modules/statusbot/manifests/init.pp
+++ b/modules/statusbot/manifests/init.pp
@@ -63,17 +63,36 @@ class statusbot(
   }
 
   file { '/var/log/statusbot':
-    ensure => directory,
-    owner  => 'statusbot',
-    group  => 'statusbot',
-    mode   => '0775',
+    ensure  => directory,
+    owner   => 'statusbot',
+    group   => 'statusbot',
+    mode    => '0775',
+    require => User['statusbot'],
   }
 
   file { '/var/run/statusbot':
-    ensure => directory,
-    owner  => 'statusbot',
-    group  => 'statusbot',
-    mode   => '0775',
+    ensure  => directory,
+    owner   => 'statusbot',
+    group   => 'statusbot',
+    mode    => '0775',
+    require => User['statusbot'],
+  }
+
+  file { '/var/lib/statusbot':
+    ensure  => directory,
+    owner   => 'statusbot',
+    group   => 'statusbot',
+    mode    => '0775',
+    require => User['statusbot'],
+  }
+
+  file { '/var/lib/statusbot/www':
+    ensure  => directory,
+    owner   => 'statusbot',
+    group   => 'statusbot',
+    mode    => '0775',
+    require => [File['/var/lib/statusbot'],
+                User['statusbot']]
   }
 
   file { '/etc/statusbot/logging.config':
diff --git a/modules/statusbot/templates/statusbot.config.erb b/modules/statusbot/templates/statusbot.config.erb
index 55dec51435..87743ee4d7 100644
--- a/modules/statusbot/templates/statusbot.config.erb
+++ b/modules/statusbot/templates/statusbot.config.erb
@@ -13,3 +13,6 @@ username=<%= wiki_user %>
 password=<%= wiki_password %>
 url=<%= wiki_url %>
 pageid=<%= wiki_pageid %>
+
+[alertfile]
+dir=/var/lib/statusbot/www