Skip to content
Snippets Groups Projects
Commit 5437c363 authored by Maddy Chellathurai's avatar Maddy Chellathurai
Browse files

Merge remote-tracking branch 'ogresCE/MAGETWO-40533-web-setup-tool-nginx' into PR_Branch

parents 2ece96e1 e1d71eff
Branches
No related merge requests found
......@@ -184,9 +184,12 @@ class Http implements \Magento\Framework\AppInterface
$this->_response->setRedirect($setupInfo->getUrl());
$this->_response->sendHeaders();
} else {
$newMessage = $exception->getMessage() . "\nNOTE: web setup wizard is not accessible.\n"
. 'In order to install, use Magento Setup CLI or configure web access to the following directory: '
. $setupInfo->getDir($projectRoot);
$newMessage = $exception->getMessage() . "\nNOTE: You cannot install Magento using the Setup Wizard "
. "because the Magento setup directory cannot be accessed. \n"
. 'You can install Magento using either the command line or you must restore access '
. 'to the following directory: ' . $setupInfo->getDir($projectRoot) . "\n";
$newMessage .= 'If you are using the sample nginx configuration, please go to '
. $this->_request->getScheme(). '://' . $this->_request->getHttpHost() . $setupInfo->getUrl();
throw new \Exception($newMessage, 0, $exception);
}
}
......
......@@ -36,7 +36,7 @@ location /setup {
include fastcgi_params;
}
location ~ /setup/(?!pub/). {
location ~ ^/setup/(?!pub/). {
deny all;
}
}
......@@ -44,7 +44,7 @@ location /setup {
location /update {
root $MAGE_ROOT;
location ~ /update/index.php {
location ~ ^/update/index.php {
fastcgi_pass fastcgi_backend;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
......@@ -52,7 +52,7 @@ location /update {
}
# deny everything but index.php
location ~ /update/(?!pub/). {
location ~ ^/update/(?!pub/). {
deny all;
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment