Skip to content

Commit cd568a7

Browse files
committed
Fixed: FS#1277 - Empty server/conf/index/.htaccess
1 parent f8d8a4e commit cd568a7

File tree

4 files changed

+3
-5
lines changed

4 files changed

+3
-5
lines changed

server/conf/index/.htaccess

Whitespace-only changes.

server/conf/index/favicon.ico

-1.37 KB
Binary file not shown.

server/conf/index/robots.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

server/plugins-available/apache2_plugin.inc.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,9 @@ function update($event_name,$data) {
415415
}
416416
else {
417417
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");
418-
exec("cp /usr/local/ispconfig/server/conf/index/favicon.ico ".escapeshellcmd($data["new"]["document_root"])."/web/");
419-
exec("cp /usr/local/ispconfig/server/conf/index/robots.txt ".escapeshellcmd($data["new"]["document_root"])."/web/");
420-
exec("cp /usr/local/ispconfig/server/conf/index/.htaccess ".escapeshellcmd($data["new"]["document_root"])."/web/");
418+
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/");
419+
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/");
420+
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/");
421421
}
422422
}
423423
exec("chmod -R a+r ".escapeshellcmd($data["new"]["document_root"])."/web/");

0 commit comments

Comments
 (0)