diff --git a/roles/nagios_server/files/httpd/robots.txt b/roles/nagios_server/files/httpd/robots.txt
new file mode 100644
index 0000000000..c6742d8a8c
--- /dev/null
+++ b/roles/nagios_server/files/httpd/robots.txt
@@ -0,0 +1,2 @@
+User-Agent: *
+Disallow: /
diff --git a/roles/nagios_server/tasks/main.yml b/roles/nagios_server/tasks/main.yml
index e357d628dc..a110f2aa09 100644
--- a/roles/nagios_server/tasks/main.yml
+++ b/roles/nagios_server/tasks/main.yml
@@ -274,6 +274,11 @@
   - nagios_server
 
 
+- name: Copy robots.txt
+  copy: src=httpd/robots.txt dest=/var/www/robots.txt
+  tags:
+  - nagios_server
+
 ## Build template files
 # This one may go to being just a regular config file if we can make remote monitoring work
 - name: Template out the nagios httpd conf
diff --git a/roles/nagios_server/templates/httpd/nagios.conf.j2 b/roles/nagios_server/templates/httpd/nagios.conf.j2
index c3735e898d..1287c9267a 100644
--- a/roles/nagios_server/templates/httpd/nagios.conf.j2
+++ b/roles/nagios_server/templates/httpd/nagios.conf.j2
@@ -2,6 +2,8 @@
 ScriptAlias /nagios/cgi-bin/ /usr/lib64/nagios/cgi-bin/
 ScriptAlias /tac.cgi         /usr/lib64/nagios/cgi-bin/tac.cgi
 
+Alias /robots.txt /var/www/robots.txt
+
 # Set up the authorization
 
 <Location /nagios>
@@ -16,13 +18,25 @@ ScriptAlias /tac.cgi         /usr/lib64/nagios/cgi-bin/tac.cgi
 {% endif %}
   GssapiLocalName on
   AuthType GSSAPI
-  Require valid-user
+  <Limit GET HEAD>
+    Require all granted
+  </Limit>
+  <LimitExcept GET HEAD>
+    Require valid-user
+  </LimitExcept>
 </Location>
 
 <Location ~ "/nagios/cgi-bin/">
   Options ExecCGI
 </Location>
 
+<Location /nagios/cgi-bin/cmd.cgi>
+  Require valid-user
+</Location>
+<Location /nagios/cgi-bin/config.cgi>
+  Require valid-user
+</Location>
+
 <Location /apache-status>
     SetHandler server-status
 {% if vars['nagios_location'] == 'external' %}