Merge branch 'master' into feature/unsecure-proxy

# Conflicts:
#	cli/Valet/Site.php
#	cli/stubs/proxy.valet.conf

Author: mikaelpopowicz

.github/issue_template.md

@@ -4,6 +4,12 @@ NOTE: If your issue is a feature request, please feel to delete this template an
 ------
 <!-- End note -->
 
+<!-- DID YOU KNOW? MOST PROBLEMS CAN BE RESOLVED BY RUNNING 3 COMMANDS:
+`composer self-update`
+`composer global update`
+`brew upgrade`
+... in fact it's good to run these commands at least once a month! -->
+
 ## Clear description of your problem
 <!-- Please provide a general summary of the issue here -->
 

cli/Valet/Configuration.php

@@ -36,7 +36,7 @@ function install()
 
     /**
      * Forcefully delete the Valet home configuration directory and contents.
-     * 
+     *
      * @return void
      */
     function uninstall()
@@ -130,19 +130,21 @@ function createCertificatesDirectory()
     function writeBaseConfiguration()
     {
         if (! $this->files->exists($this->path())) {
-            $this->write(['tld' => 'test', 'paths' => []]);
+            $this->write(['tld' => 'test', 'loopback' => VALET_LOOPBACK, 'paths' => []]);
         }
 
         /**
          * Migrate old configurations from 'domain' to 'tld'
          */
         $config = $this->read();
 
-        if (isset($config['tld'])) {
-            return;
+        if (! isset($config['tld'])) {
+            $this->updateKey('tld', !empty($config['domain']) ? $config['domain'] : 'test');
         }
 
-        $this->updateKey('tld', !empty($config['domain']) ? $config['domain'] : 'test');
+        if (! isset($config['loopback'])) {
+            $this->updateKey('loopback', VALET_LOOPBACK);
+        }
     }
 
     /**

cli/Valet/Diagnose.php

@@ -41,8 +41,13 @@ class Diagnose
         'ls -al ~/Library/LaunchAgents | grep homebrew',
         'ls -al /Library/LaunchAgents | grep homebrew',
         'ls -al /Library/LaunchDaemons | grep homebrew',
+        'ls -al /Library/LaunchDaemons | grep "com.laravel.valet."',
         'ls -aln /etc/resolv.conf',
         'cat /etc/resolv.conf',
+        'ifconfig lo0',
+        'sh -c \'echo "------\n'.BREW_PREFIX.'/etc/nginx/valet/valet.conf\n---\n"; cat '.BREW_PREFIX.'/etc/nginx/valet/valet.conf | grep -n "# valet loopback"; echo "\n------\n"\'',
+        'sh -c \'for file in ~/.config/valet/dnsmasq.d/*; do echo "------\n~/.config/valet/dnsmasq.d/$(basename $file)\n---\n"; cat $file; echo "\n------\n"; done\'',
+        'sh -c \'for file in ~/.config/valet/nginx/*; do echo "------\n~/.config/valet/nginx/$(basename $file)\n---\n"; cat $file | grep -n "# valet loopback"; echo "\n------\n"; done\'',
     ];
 
     var $cli, $files, $print, $progressBar;

cli/Valet/DnsMasq.php

@@ -46,7 +46,7 @@ function install($tld = 'test')
 
     /**
      * Forcefully uninstall dnsmasq.
-     * 
+     *
      * @return void
      */
     function uninstall()
@@ -60,7 +60,7 @@ function uninstall()
 
     /**
      * Tell Homebrew to restart dnsmasq
-     * 
+     *
      * @return void
      */
     function restart()
@@ -113,21 +113,23 @@ function ensureUsingDnsmasqDForConfigs()
     function createDnsmasqTldConfigFile($tld)
     {
         $tldConfigFile = $this->dnsmasqUserConfigDir() . 'tld-' . $tld . '.conf';
+        $loopback = $this->configuration->read()['loopback'];
 
-        $this->files->putAsUser($tldConfigFile, 'address=/.'.$tld.'/127.0.0.1'.PHP_EOL.'listen-address=127.0.0.1'.PHP_EOL);
+        $this->files->putAsUser($tldConfigFile, 'address=/.'.$tld.'/'.$loopback.PHP_EOL.'listen-address='.$loopback.PHP_EOL);
     }
 
     /**
-     * Create the resolver file to point the configured TLD to 127.0.0.1.
+     * Create the resolver file to point the configured TLD to configured loopback address.
      *
      * @param  string  $tld
      * @return void
      */
     function createTldResolver($tld)
     {
         $this->files->ensureDirExists($this->resolverPath);
+        $loopback = $this->configuration->read()['loopback'];
 
-        $this->files->put($this->resolverPath.'/'.$tld, 'nameserver 127.0.0.1'.PHP_EOL);
+        $this->files->put($this->resolverPath.'/'.$tld, 'nameserver '.$loopback.PHP_EOL);
     }
 
     /**
@@ -145,6 +147,18 @@ function updateTld($oldTld, $newTld)
         $this->install($newTld);
     }
 
+    /**
+     * Refresh the DnsMasq configuration.
+     *
+     * @return void
+     */
+    function refreshConfiguration()
+    {
+        $tld = $this->configuration->read()['tld'];
+
+        $this->updateTld($tld, $tld);
+    }
+
     /**
      * Get the custom configuration path.
      *

cli/Valet/Nginx.php

@@ -80,7 +80,7 @@ function installServer()
             str_replace(
                 ['VALET_HOME_PATH', 'VALET_SERVER_PATH', 'VALET_STATIC_PREFIX'],
                 [VALET_HOME_PATH, VALET_SERVER_PATH, VALET_STATIC_PREFIX],
-                $this->files->get(__DIR__.'/../stubs/valet.conf')
+                $this->replaceLoopback($this->files->get(__DIR__.'/../stubs/valet.conf'))
             )
         );
 
@@ -90,6 +90,23 @@ function installServer()
         );
     }
 
+    function replaceLoopback($siteConf)
+    {
+        $loopback = $this->configuration->read()['loopback'];
+
+        if ($loopback === VALET_LOOPBACK) {
+            return $siteConf;
+        }
+
+        $str = '#listen VALET_LOOPBACK:80; # valet loopback';
+
+        return str_replace(
+            $str,
+            substr(str_replace('VALET_LOOPBACK', $loopback, $str), 1),
+            $siteConf
+        );
+    }
+
     /**
      * Install the Nginx configuration directory to the ~/.config/valet directory.
      *
@@ -131,8 +148,15 @@ function ($exitCode, $outputMessage) {
     function rewriteSecureNginxFiles()
     {
         $tld = $this->configuration->read()['tld'];
+        $loopback = $this->configuration->read()['loopback'];
+
+        if ($loopback !== VALET_LOOPBACK) {
+            $this->site->aliasLoopback(VALET_LOOPBACK, $loopback);
+        }
+
+        $config = compact('tld', 'loopback');
 
-        $this->site->resecureForNewTld($tld, $tld);
+        $this->site->resecureForNewConfiguration($config, $config);
     }
 
     /**

cli/Valet/PhpFpm.php

@@ -202,6 +202,10 @@ function useVersion($version, $force = false)
 
         $this->stopRunning();
 
+        // remove any orphaned valet.sock files that PHP didn't clean up due to version conflicts
+        $this->files->unlink(VALET_HOME_PATH.'/valet.sock');
+        $this->cli->quietly('sudo rm ' . VALET_HOME_PATH.'/valet.sock');
+
         // ensure configuration is correct and start the linked version
         $this->install();