diff --git a/cli/Valet/Caddy.php b/cli/Valet/Caddy.php index 464c5b0..b5b9358 100644 --- a/cli/Valet/Caddy.php +++ b/cli/Valet/Caddy.php @@ -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')) ); } diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php index 509dd05..4d5b9a6 100644 --- a/cli/Valet/Site.php +++ b/cli/Valet/Site.php @@ -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') ); } diff --git a/cli/includes/helpers.php b/cli/includes/helpers.php index a30508d..7f97a87 100644 --- a/cli/includes/helpers.php +++ b/cli/includes/helpers.php @@ -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. diff --git a/cli/stubs/Caddyfile b/cli/stubs/Caddyfile index 3cafb23..d015802 100644 --- a/cli/stubs/Caddyfile +++ b/cli/stubs/Caddyfile @@ -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 { diff --git a/cli/stubs/SecureCaddyfile b/cli/stubs/SecureCaddyfile index 4186ba1..045ce9c 100644 --- a/cli/stubs/SecureCaddyfile +++ b/cli/stubs/SecureCaddyfile @@ -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 {