phpmon/laravel-valet
1
0
Fork 0
mirror of https://github.com/laravel/valet.git synced 2026-02-05 08:30:07 +01:00
Code Activity

Use UUID for static asset path instead of "static"

Browse Source
This commit is contained in:
Adam Wathan
2016-12-12 15:46:09 -05:00
parent 6376bfca82
commit 6727e43288
7 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/Valet/Nginx.php
View File

@@ -71,8 +71,8 @@ function installServer()
$this->files->putAsUser( $this->files->putAsUser(
'/usr/local/etc/nginx/valet/valet.conf', '/usr/local/etc/nginx/valet/valet.conf',
str_replace( str_replace(
['VALET_HOME_PATH', 'VALET_SERVER_PATH'], ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_STATIC_PREFIX'],
[VALET_HOME_PATH, VALET_SERVER_PATH], [VALET_HOME_PATH, VALET_SERVER_PATH, VALET_STATIC_PREFIX],
$this->files->get(__DIR__.'/../stubs/valet.conf') $this->files->get(__DIR__.'/../stubs/valet.conf')
) )
); );

4
cli/Valet/Site.php
View File

@@ -211,8 +211,8 @@ function buildSecureNginxServer($url)
$path = $this->certificatesPath(); $path = $this->certificatesPath();
return str_replace( return str_replace(
['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_STATIC_PREFIX', '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, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'],
$this->files->get(__DIR__.'/../stubs/secure.valet.conf') $this->files->get(__DIR__.'/../stubs/secure.valet.conf')
); );
} }

2
cli/drivers/ValetDriver.php
View File

@@ -138,7 +138,7 @@ public function serveStaticFile($staticFilePath, $sitePath, $siteName, $uri)
header('Content-Type: text/html'); header('Content-Type: text/html');
header_remove('Content-Type'); header_remove('Content-Type');
header('X-Accel-Redirect: /static' . $staticFilePath); header('X-Accel-Redirect: /' . VALET_STATIC_PREFIX . $staticFilePath);
} }
/** /**

1
cli/includes/helpers.php
View File

@@ -8,6 +8,7 @@
*/ */
define('VALET_HOME_PATH', $_SERVER['HOME'].'/.valet'); define('VALET_HOME_PATH', $_SERVER['HOME'].'/.valet');
define('VALET_SERVER_PATH', realpath(__DIR__ . '/../../server.php')); define('VALET_SERVER_PATH', realpath(__DIR__ . '/../../server.php'));
define('VALET_STATIC_PREFIX', '41c270e4-5535-4daa-b23e-c269744c2f45');
/** /**
* Output the given text to the console. * Output the given text to the console.

2
cli/stubs/secure.valet.conf
View File

@@ -10,7 +10,7 @@ server {
root /; root /;
charset utf-8; charset utf-8;
location /static/ { location /VALET_STATIC_PREFIX/ {
internal; internal;
alias /; alias /;
try_files $uri $uri/; try_files $uri $uri/;

2
cli/stubs/valet.conf
View File

@@ -3,7 +3,7 @@ server {
root /; root /;
charset utf-8; charset utf-8;
location /static/ { location /VALET_STATIC_PREFIX/ {
internal; internal;
alias /; alias /;
try_files $uri $uri/; try_files $uri $uri/;

1
server.php
View File

@@ -5,6 +5,7 @@
*/ */
define('VALET_HOME_PATH', posix_getpwuid(fileowner(__FILE__))['dir'].'/.valet'); 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. * Show the Valet 404 "Not Found" page.