Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Zvonimir
ISPConfig 3
Commits
4f1e6a27
Commit
4f1e6a27
authored
Aug 14, 2014
by
Till Brehm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FS#3601 - Stop creating .htaccess files for NginX sites
parent
14ee7385
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
server/plugins-available/nginx_plugin.inc.php
server/plugins-available/nginx_plugin.inc.php
+4
-4
No files found.
server/plugins-available/nginx_plugin.inc.php
View file @
4f1e6a27
...
...
@@ -643,9 +643,9 @@ class nginx_plugin {
if
(
is_file
(
$conf
[
'rootpath'
]
.
'/conf-custom/index/robots.txt'
))
{
exec
(
'cp '
.
$conf
[
'rootpath'
]
.
'/conf-custom/index/robots.txt '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/'
);
}
if
(
is_file
(
$conf
[
'rootpath'
]
.
'/conf-custom/index/.htaccess'
))
{
exec
(
'cp '
.
$conf
[
'rootpath'
]
.
'/conf-custom/index/.htaccess '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/'
);
}
//
if(is_file($conf['rootpath'] . '/conf-custom/index/.htaccess')) {
//
exec('cp ' . $conf['rootpath'] . '/conf-custom/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/' . $web_folder . '/');
//
}
}
else
{
if
(
file_exists
(
$conf
[
'rootpath'
]
.
'/conf-custom/index/standard_index.html'
))
{
...
...
@@ -655,7 +655,7 @@ class nginx_plugin {
exec
(
'cp '
.
$conf
[
'rootpath'
]
.
'/conf/index/standard_index.html_'
.
substr
(
escapeshellcmd
(
$conf
[
'language'
]),
0
,
2
)
.
' '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/index.html'
);
if
(
is_file
(
$conf
[
'rootpath'
]
.
'/conf/index/favicon.ico'
))
exec
(
'cp '
.
$conf
[
'rootpath'
]
.
'/conf/index/favicon.ico '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/'
);
if
(
is_file
(
$conf
[
'rootpath'
]
.
'/conf/index/robots.txt'
))
exec
(
'cp '
.
$conf
[
'rootpath'
]
.
'/conf/index/robots.txt '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/'
);
if
(
is_file
(
$conf
[
'rootpath'
]
.
'/conf/index/.htaccess'
))
exec
(
'cp '
.
$conf
[
'rootpath'
]
.
'/conf/index/.htaccess '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/'
);
//
if(is_file($conf['rootpath'] . '/conf/index/.htaccess')) exec('cp ' . $conf['rootpath'] . '/conf/index/.htaccess '.escapeshellcmd($data['new']['document_root']).'/' . $web_folder . '/');
}
}
exec
(
'chmod -R a+r '
.
escapeshellcmd
(
$data
[
'new'
][
'document_root'
])
.
'/'
.
$web_folder
.
'/'
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment