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

Fix incorrect path replacement for server.php

Browse Source
This commit is contained in:
Adam Wathan
2016-08-09 14:57:35 -04:00
parent 3409f2998b
commit 4aee028ca5
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Valet/Caddy.php
View File

@@ -43,7 +43,7 @@ function installCaddyFile()
{
$this->files->putAsUser(
VALET_HOME_PATH.'/Caddyfile',
str_replace('VALET_HOME_PATH', VALET_HOME_PATH, $this->files->get(__DIR__.'/../stubs/Caddyfile'))
str_replace(['VALET_HOME_PATH', 'VALET_SERVER_PATH'], [VALET_HOME_PATH, VALET_SERVER_PATH], $this->files->get(__DIR__.'/../stubs/Caddyfile'))
);
}

2
cli/Valet/Site.php
View File

@@ -211,7 +211,7 @@ function buildSecureCaddyfile($url)
$path = $this->certificatesPath();
return str_replace(
['VALET_HOME_PATH', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], [VALET_HOME_PATH, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'],
['VALET_SERVER_PATH', 'VALET_SITE', 'VALET_CERT', 'VALET_KEY'], [VALET_SERVER_PATH, $url, $path.'/'.$url.'.crt', $path.'/'.$url.'.key'],
$this->files->get(__DIR__.'/../stubs/SecureCaddyfile')
);
}

1
cli/includes/helpers.php
View File

@@ -7,6 +7,7 @@
* Define the ~/.valet path as a constant.
*/
define('VALET_HOME_PATH', $_SERVER['HOME'].'/.valet');
define('VALET_SERVER_PATH', realpath(__DIR__ . '/../../server.php'));
/**
* Output the given text to the console.

4
cli/stubs/Caddyfile
View File

@@ -5,11 +5,11 @@ import VALET_HOME_PATH/Caddy/*
internal /madeupfolder
fastcgi / 127.0.0.1:9000 php {
index VALET_HOME_PATH/server.php
index VALET_SERVER_PATH
}
rewrite {
to VALET_HOME_PATH/server.php?{query}
to VALET_SERVER_PATH?{query}
}
log VALET_HOME_PATH/Log/access.log {

4
cli/stubs/SecureCaddyfile
View File

@@ -6,11 +6,11 @@ https://VALET_SITE:443 {
tls VALET_CERT VALET_KEY
fastcgi / 127.0.0.1:9000 php {
index VALET_HOME_PATH/server.php
index VALET_SERVER_PATH
}
rewrite {
to VALET_HOME_PATH/server.php?{query}
to VALET_SERVER_PATH?{query}
}
log VALET_HOME_PATH/Log/access.log {