1
0
mirror of https://github.com/laravel/valet.git synced 2026-02-04 16:10:08 +01:00

Fix DnsMasq path, remove incorrect use of rewrite secure

This commit is contained in:
Erik Berkun-Drevnig
2017-10-22 16:39:50 -04:00
parent 6ba61dcc77
commit 19fe60880c
3 changed files with 5 additions and 2 deletions

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@
vendor/
composer.lock
error.log
.idea

View File

@@ -9,7 +9,7 @@ class Configuration
/**
* Create a new Valet configuration class instance.
*
* @param Filesystem $filesystem
* @param Filesystem $files
*/
function __construct(Filesystem $files)
{
@@ -47,7 +47,6 @@ function createConfigurationDirectory()
if ($this->files->isDir($oldPath)) {
rename($oldPath, VALET_HOME_PATH);
Nginx::rewriteSecureNginxFiles();
}
}

View File

@@ -87,6 +87,9 @@ function copyExampleConfig()
*/
function appendCustomConfigImport($customConfigPath)
{
$contents = preg_replace('/^conf-file=.*\/\.valet\/.*$/m', '', $this->files->get($this->configPath));
$this->files->putAsUser($this->configPath, $contents);
if (! $this->customConfigIsBeingImported($customConfigPath)) {
$this->files->appendAsUser(
$this->configPath,