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

Fix conflicts

Browse Source
This commit is contained in:
Adam Wathan
2016-09-24 10:35:22 -04:00
parent 5e365f4bfb c477880cc4
commit 028d2d5208
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/Valet/Site.php
View File

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