4 files changed, 22 insertions, 1 deletions
diff --git a/modules/phpbb/files/robots.txt b/modules/phpbb/files/robots.txt
new file mode 100644
index 00000000..1c335a73
--- /dev/null
+++ b/modules/phpbb/files/robots.txt
@@ -0,0 +1,7 @@
+User-agent: *
+Disallow: /*/faq.php?
+Disallow: /*/memberlist.php?
+Disallow: /*/posting.php?
+Disallow: /*/search.php?
+Disallow: /*/ucp.php?
+Crawl-delay: 30
diff --git a/modules/phpbb/manifests/base.pp b/modules/phpbb/manifests/base.pp
index 82340c7d..9f676cb4 100644
--- a/modules/phpbb/manifests/base.pp
+++ b/modules/phpbb/manifests/base.pp
@@ -29,6 +29,15 @@ class phpbb::base {
         ensure => directory,
     }
 
+    $robotsfile = "$forums_dir/robots.txt"
+    file { $robotsfile:
+        ensure => present,
+        mode   => '0644',
+        owner  => root,
+        group  => root,
+        source => 'puppet:///modules/phpbb/robots.txt',
+    }
+
     # TODO check that everything is locked down
     apache::vhost::base { "forums.${::domain}":
         content => template('phpbb/forums_vhost.conf'),
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
index d688b019..e300d9e0 100644
--- a/modules/phpbb/manifests/instance.pp
+++ b/modules/phpbb/manifests/instance.pp
@@ -18,7 +18,7 @@ define phpbb::instance() {
     }
 
     # remove this or the forum will not work ( 'board disabled' )
-    # maybe it would be better to move this elsehwere, I
+    # maybe it would be better to move this elsewhere, I
     # am not sure ( and in any case, that's still in git )
     exec { "rm_install ${lang}":
         command => "rm -Rf ${forums_dir}/${lang}/phpBB/install",
diff --git a/modules/phpbb/templates/forums_vhost.conf b/modules/phpbb/templates/forums_vhost.conf
index 2a8234e6..440dad1f 100644
--- a/modules/phpbb/templates/forums_vhost.conf
+++ b/modules/phpbb/templates/forums_vhost.conf
@@ -4,12 +4,17 @@
     # for locale redirection
     Include conf/vhosts.d/forums.d/*.conf
 
+    # Prevent including forum site in tier iframe
+    Header set X-Frame-Options DENY
+
 
     # using Redirect create a loop, so we use mod_rewrite here
     RewriteEngine On
     RewriteRule ^/$ /en/ [R]
     RewriteRule ^/(..)$ /$1/ [R]
 
+    Alias /robots.txt <%= forums_dir %>/robots.txt
+
     AliasMatch ^/(..)/(.*) <%= forums_dir %>/$1/phpBB/$2
 
     <Directory ~ "<%= forums_dir %>/.*/phpBB/">