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

Fix DnsMasq path, remove incorrect use of rewrite secure

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

3
cli/Valet/Configuration.php
View File

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

3
cli/Valet/DnsMasq.php
View File

@@ -87,6 +87,9 @@ function copyExampleConfig()
*/ */
function appendCustomConfigImport($customConfigPath) 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)) { if (! $this->customConfigIsBeingImported($customConfigPath)) {
$this->files->appendAsUser( $this->files->appendAsUser(
$this->configPath, $this->configPath,