diff --git a/server/conf/index/.htaccess b/server/conf/index/.htaccess deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/server/conf/index/favicon.ico b/server/conf/index/favicon.ico deleted file mode 100644 index da6257c84cce5c550eb7118581ed2a22f15af248..0000000000000000000000000000000000000000 Binary files a/server/conf/index/favicon.ico and /dev/null differ diff --git a/server/conf/index/robots.txt b/server/conf/index/robots.txt deleted file mode 100644 index 4354fd969db22e99f4e9f662d943bf5a5a7c1155..0000000000000000000000000000000000000000 --- a/server/conf/index/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: /stats/ diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index a40406034572e4518cbed197ad6da0fb80dcbe33..611fbc1c8275035eec15dc6ff2b9cc04576f4837 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -415,9 +415,9 @@ class apache2_plugin { } else { exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html"); - exec("cp /usr/local/ispconfig/server/conf/index/favicon.ico ".escapeshellcmd($data["new"]["document_root"])."/web/"); - exec("cp /usr/local/ispconfig/server/conf/index/robots.txt ".escapeshellcmd($data["new"]["document_root"])."/web/"); - exec("cp /usr/local/ispconfig/server/conf/index/.htaccess ".escapeshellcmd($data["new"]["document_root"])."/web/"); + if(is_file('/usr/local/ispconfig/server/conf/index/favicon.ico')) exec("cp /usr/local/ispconfig/server/conf/index/favicon.ico ".escapeshellcmd($data["new"]["document_root"])."/web/"); + if(is_file('/usr/local/ispconfig/server/conf/index/robots.txt')) exec("cp /usr/local/ispconfig/server/conf/index/robots.txt ".escapeshellcmd($data["new"]["document_root"])."/web/"); + if(is_file('/usr/local/ispconfig/server/conf/index/.htaccess')) exec("cp /usr/local/ispconfig/server/conf/index/.htaccess ".escapeshellcmd($data["new"]["document_root"])."/web/"); } } exec("chmod -R a+r ".escapeshellcmd($data["new"]["document_root"])."/web/");