From 1c711c8e544d7d0f62d73c0d8367fa709b59cfce Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 19 May 2011 14:57:54 +0000
Subject: [PATCH] Syncing from our internal branch. This adds safe default
favicon.ico which is blank, a simple .htaccess, and a simple robots.txt.
This will also reduce 404s on the whole server
---
server/conf/index/.htaccess | 1 +
server/conf/index/favicon.ico | Bin 0 -> 7358 bytes
server/conf/index/robots.txt | 2 ++
server/plugins-available/apache2_plugin.inc.php | 5 ++++-
4 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 server/conf/index/.htaccess
create mode 100644 server/conf/index/favicon.ico
create mode 100644 server/conf/index/robots.txt
diff --git a/server/conf/index/.htaccess b/server/conf/index/.htaccess
new file mode 100644
index 0000000000..a5cff82f71
--- /dev/null
+++ b/server/conf/index/.htaccess
@@ -0,0 +1 @@
+## Default .htaccess file
diff --git a/server/conf/index/favicon.ico b/server/conf/index/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7a6c6874616ee08a310cb53f0c724a2cf6a743ff
GIT binary patch
literal 7358
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
B@Oc0L
literal 0
HcmV?d00001
diff --git a/server/conf/index/robots.txt b/server/conf/index/robots.txt
new file mode 100644
index 0000000000..eb0536286f
--- /dev/null
+++ b/server/conf/index/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 5011d5fa55..4868e28bf9 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -441,6 +441,9 @@ class apache2_plugin {
// copy the standard index page
if (file_exists('/usr/local/ispconfig/server/conf-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2))) {
exec('cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html_'.substr(escapeshellcmd($conf['language']),0,2).' '.escapeshellcmd($data['new']['document_root']).'/web/index.html');
+ if(is_file('/usr/local/ispconfig/server/conf-custom/index/favicon.ico')) exec('cp /usr/local/ispconfig/server/conf-custom/index/favicon.ico '.escapeshellcmd($data['new']['document_root']).'/web/');
+ if(is_file('/usr/local/ispconfig/server/conf-custom/index/robots.txt')) exec('cp /usr/local/ispconfig/server/conf-custom/index/robots.txt '.escapeshellcmd($data['new']['document_root']).'/web/');
+ if(is_file('/usr/local/ispconfig/server/conf-custom/index/.htaccess')) exec('cp /usr/local/ispconfig/server/conf-custom/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/web/');
}
else {
if (file_exists('/usr/local/ispconfig/server/conf-custom/index/standard_index.html')) {
@@ -1418,4 +1421,4 @@ class apache2_plugin {
} // end class
-?>
+?>
\ No newline at end of file
--
GitLab