diff --git a/cli/Valet/Nginx.php b/cli/Valet/Nginx.php index 82dea2d..7ff767a 100644 --- a/cli/Valet/Nginx.php +++ b/cli/Valet/Nginx.php @@ -71,8 +71,8 @@ function installServer() $this->files->putAsUser( '/usr/local/etc/nginx/valet/valet.conf', str_replace( - ['VALET_HOME_PATH', 'VALET_SERVER_PATH'], - [VALET_HOME_PATH, VALET_SERVER_PATH], + ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_STATIC_PREFIX'], + [VALET_HOME_PATH, VALET_SERVER_PATH, VALET_STATIC_PREFIX], $this->files->get(__DIR__.'/../stubs/valet.conf') ) ); diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php index 514a85b..1220647 100644 --- a/cli/Valet/Site.php +++ b/cli/Valet/Site.php @@ -211,8 +211,8 @@ function buildSecureNginxServer($url) $path = $this->certificatesPath(); return str_replace( - ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], - [VALET_HOME_PATH, VALET_SERVER_PATH, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'], + ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_STATIC_PREFIX', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], + [VALET_HOME_PATH, VALET_SERVER_PATH, VALET_STATIC_PREFIX, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'], $this->files->get(__DIR__.'/../stubs/secure.valet.conf') ); } diff --git a/cli/drivers/ValetDriver.php b/cli/drivers/ValetDriver.php index ac37335..0c84213 100644 --- a/cli/drivers/ValetDriver.php +++ b/cli/drivers/ValetDriver.php @@ -138,7 +138,7 @@ public function serveStaticFile($staticFilePath, $sitePath, $siteName, $uri) header('Content-Type: text/html'); header_remove('Content-Type'); - header('X-Accel-Redirect: /static' . $staticFilePath); + header('X-Accel-Redirect: /' . VALET_STATIC_PREFIX . $staticFilePath); } /** diff --git a/cli/includes/helpers.php b/cli/includes/helpers.php index 34b4400..e5a937e 100644 --- a/cli/includes/helpers.php +++ b/cli/includes/helpers.php @@ -8,6 +8,7 @@ */ define('VALET_HOME_PATH', $_SERVER['HOME'].'/.valet'); define('VALET_SERVER_PATH', realpath(__DIR__ . '/../../server.php')); +define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45'); /** * Output the given text to the console. diff --git a/cli/stubs/secure.valet.conf b/cli/stubs/secure.valet.conf index 227af21..7b3ec09 100644 --- a/cli/stubs/secure.valet.conf +++ b/cli/stubs/secure.valet.conf @@ -10,7 +10,7 @@ server { root /; charset utf-8; - location /static/ { + location /VALET_STATIC_PREFIX/ { internal; alias /; try_files $uri $uri/; diff --git a/cli/stubs/valet.conf b/cli/stubs/valet.conf index fe33229..0290752 100644 --- a/cli/stubs/valet.conf +++ b/cli/stubs/valet.conf @@ -3,7 +3,7 @@ server { root /; charset utf-8; - location /static/ { + location /VALET_STATIC_PREFIX/ { internal; alias /; try_files $uri $uri/; diff --git a/server.php b/server.php index 7f9832a..932919b 100644 --- a/server.php +++ b/server.php @@ -5,6 +5,7 @@ */ define('VALET_HOME_PATH', posix_getpwuid(fileowner(__FILE__))['dir'].'/.valet'); +define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45'); /** * Show the Valet 404 "Not Found" page.