diff --git a/bin/LICENSES.txt b/bin/LICENSES.txt deleted file mode 100644 index 83c2ea9..0000000 --- a/bin/LICENSES.txt +++ /dev/null @@ -1,539 +0,0 @@ -The enclosed software makes use of third-party libraries either in full -or in part, original or modified. This file is part of your download so -as to be in full compliance with the licenses of all bundled property. - - - -### -### github.com/mholt/caddy -### - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - - - - - -### -### Go standard library and http2 -### - - -Copyright (c) 2012 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - - - - - -### -### github.com/russross/blackfriday -### - - -Blackfriday is distributed under the Simplified BSD License: - -> Copyright © 2011 Russ Ross -> All rights reserved. -> -> Redistribution and use in source and binary forms, with or without -> modification, are permitted provided that the following conditions -> are met: -> -> 1. Redistributions of source code must retain the above copyright -> notice, this list of conditions and the following disclaimer. -> -> 2. Redistributions in binary form must reproduce the above -> copyright notice, this list of conditions and the following -> disclaimer in the documentation and/or other materials provided with -> the distribution. -> -> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -> "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -> FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -> COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -> INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -> BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -> CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -> LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -> ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -> POSSIBILITY OF SUCH DAMAGE. - - - - - - - - -### -### github.com/dustin/go-humanize -### - - -Copyright (c) 2005-2008 Dustin Sallings - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - - - - - - - - - - -### -### github.com/flynn/go-shlex -### - -Apache 2.0 license as found in this file - - - - - - -### -### github.com/go-yaml/yaml -### - - -Copyright (c) 2011-2014 - Canonical Inc. - -This software is licensed under the LGPLv3, included below. - -As a special exception to the GNU Lesser General Public License version 3 -("LGPL3"), the copyright holders of this Library give you permission to -convey to a third party a Combined Work that links statically or dynamically -to this Library without providing any Minimal Corresponding Source or -Minimal Application Code as set out in 4d or providing the installation -information set out in section 4e, provided that you comply with the other -provisions of LGPL3 and provided that you meet, for the Application the -terms and conditions of the license(s) which apply to the Application. - -Except as stated in this special exception, the provisions of LGPL3 will -continue to comply in full to this Library. If you modify this Library, you -may apply this exception to your version of this Library, but you are not -obliged to do so. If you do not wish to do so, delete this exception -statement from your version. This exception does not (and cannot) modify any -license terms which apply to the Application, with which you must still -comply. - - - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/bin/caddy b/bin/caddy deleted file mode 100755 index d9bc1c8..0000000 Binary files a/bin/caddy and /dev/null differ diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php index 2f4ccab..7d7b901 100644 --- a/cli/Valet/Brew.php +++ b/cli/Valet/Brew.php @@ -50,13 +50,14 @@ function hasInstalledPhp() * Ensure that the given formula is installed. * * @param string $formula + * @param array $options * @param array $taps * @return void */ - function ensureInstalled($formula, array $taps = []) + function ensureInstalled($formula, array $options = [], array $taps = []) { if (! $this->installed($formula)) { - $this->installOrFail($formula, $taps); + $this->installOrFail($formula, $options, $taps); } } @@ -64,10 +65,11 @@ function ensureInstalled($formula, array $taps = []) * Install the given formula and throw an exception on failure. * * @param string $formula + * @param array $options * @param array $taps * @return void */ - function installOrFail($formula, array $taps = []) + function installOrFail($formula, array $options = [], array $taps = []) { if (count($taps) > 0) { $this->tap($taps); @@ -75,7 +77,7 @@ function installOrFail($formula, array $taps = []) output('['.$formula.'] is not installed, installing it now via Brew... 🍻'); - $this->cli->runAsUser('brew install '.$formula, function ($exitCode, $errorOutput) use ($formula) { + $this->cli->runAsUser(trim('brew install '.$formula.' '.implode(' ', $options)), function ($exitCode, $errorOutput) use ($formula) { output($errorOutput); throw new DomainException('Brew was unable to install ['.$formula.'].'); diff --git a/cli/Valet/Caddy.php b/cli/Valet/Caddy.php deleted file mode 100644 index 3efc999..0000000 --- a/cli/Valet/Caddy.php +++ /dev/null @@ -1,134 +0,0 @@ -cli = $cli; - $this->files = $files; - $this->configuration = $configuration; - $this->site = $site; - } - - /** - * Install the system launch daemon for the Caddy server. - * - * @return void - */ - function install() - { - $this->installCaddyFile(); - // $this->installCaddyDirectory(); - // $this->installCaddyDaemon(); - } - - /** - * Install the Caddyfile to the ~/.valet directory. - * - * This file serves as the main server configuration for Valet. - * - * @return void - */ - function installCaddyFile() - { - $this->files->putAsUser( - '/usr/local/etc/nginx/servers/valet.conf', - str_replace(['VALET_HOME_PATH', 'VALET_SERVER_PATH'], [VALET_HOME_PATH, VALET_SERVER_PATH], $this->files->get(__DIR__.'/../stubs/valet.conf')) - ); - } - - /** - * Install the Caddy configuration directory to the ~/.valet directory. - * - * This directory contains all site-specific Caddy definitions. - * - * @return void - */ - // function installCaddyDirectory() - // { - // if (! $this->files->isDir($caddyDirectory = VALET_HOME_PATH.'/Caddy')) { - // $this->files->mkdirAsUser($caddyDirectory); - // } - - // $this->files->putAsUser($caddyDirectory.'/.keep', "\n"); - - // $this->rewriteSecureCaddyFiles(); - // } - - /** - * Generate fresh Caddyfiles for existing secure sites. - * - * This simplifies upgrading when the Caddyfile structure changes. - * - * @return void - */ - // function rewriteSecureCaddyFiles() - // { - // $domain = $this->configuration->read()['domain']; - - // $this->site->resecureForNewDomain($domain, $domain); - // } - - /** - * Install the Caddy daemon on a system level daemon. - * - * @return void - */ - // function installCaddyDaemon() - // { - // $contents = str_replace( - // 'VALET_PATH', $this->files->realpath(__DIR__.'/../../'), - // $this->files->get(__DIR__.'/../stubs/daemon.plist') - // ); - - // $this->files->put( - // $this->daemonPath, str_replace('VALET_HOME_PATH', VALET_HOME_PATH, $contents) - // ); - // } - - /** - * Restart the launch daemon. - * - * @return void - */ - function restart() - { - $this->cli->quietly('sudo brew services restart nginx'); - } - - /** - * Stop the launch daemon. - * - * @return void - */ - function stop() - { - $this->cli->quietly('sudo brew services stop nginx'); - } - - /** - * Remove the launch daemon. - * - * @return void - */ - function uninstall() - { - $this->stop(); - - // $this->files->unlink($this->daemonPath); - } -} diff --git a/cli/Valet/Nginx.php b/cli/Valet/Nginx.php new file mode 100644 index 0000000..82dea2d --- /dev/null +++ b/cli/Valet/Nginx.php @@ -0,0 +1,145 @@ +cli = $cli; + $this->brew = $brew; + $this->site = $site; + $this->files = $files; + $this->configuration = $configuration; + } + + /** + * Install the configuration files for Nginx. + * + * @return void + */ + function install() + { + $this->brew->ensureInstalled('nginx', ['--with-http2']); + + $this->installConfiguration(); + $this->installServer(); + $this->installNginxDirectory(); + } + + /** + * Install the Nginx configuration file. + * + * @return void + */ + function installConfiguration() + { + $contents = $this->files->get(__DIR__.'/../stubs/nginx.conf'); + + $this->files->putAsUser( + '/usr/local/etc/nginx/nginx.conf', + str_replace(['VALET_USER', 'VALET_HOME_PATH'], [user(), VALET_HOME_PATH], $contents) + ); + } + + /** + * Install the Valet Nginx server configuration file. + * + * @return void + */ + function installServer() + { + $this->files->ensureDirExists('/usr/local/etc/nginx/valet'); + + $this->files->putAsUser( + '/usr/local/etc/nginx/valet/valet.conf', + str_replace( + ['VALET_HOME_PATH', 'VALET_SERVER_PATH'], + [VALET_HOME_PATH, VALET_SERVER_PATH], + $this->files->get(__DIR__.'/../stubs/valet.conf') + ) + ); + + $this->files->putAsUser( + '/usr/local/etc/nginx/fastcgi_params', + $this->files->get(__DIR__.'/../stubs/fastcgi_params') + ); + } + + /** + * Install the Nginx configuration directory to the ~/.valet directory. + * + * This directory contains all site-specific Nginx servers. + * + * @return void + */ + function installNginxDirectory() + { + if (! $this->files->isDir($nginxDirectory = VALET_HOME_PATH.'/Nginx')) { + $this->files->mkdirAsUser($nginxDirectory); + } + + $this->files->putAsUser($nginxDirectory.'/.keep', "\n"); + + $this->rewriteSecureNginxFiles(); + } + + /** + * Generate fresh Nginx servers for existing secure sites. + * + * @return void + */ + function rewriteSecureNginxFiles() + { + $domain = $this->configuration->read()['domain']; + + $this->site->resecureForNewDomain($domain, $domain); + } + + /** + * Restart the Nginx service. + * + * @return void + */ + function restart() + { + $this->cli->quietly('sudo brew services restart nginx'); + } + + /** + * Stop the Nginx service. + * + * @return void + */ + function stop() + { + $this->cli->quietly('sudo brew services stop nginx'); + } + + /** + * Prepare Nginx for uninstallation. + * + * @return void + */ + function uninstall() + { + $this->stop(); + } +} diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php index 5c6a59a..7a8317d 100644 --- a/cli/Valet/PhpFpm.php +++ b/cli/Valet/PhpFpm.php @@ -40,7 +40,7 @@ function install() ! $this->brew->installed('php70') && ! $this->brew->installed('php56') && ! $this->brew->installed('php55')) { - $this->brew->ensureInstalled('php70', $this->taps); + $this->brew->ensureInstalled('php70', [], $this->taps); } $this->files->ensureDirExists('/usr/local/var/log', user()); diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php index f176a7d..514a85b 100644 --- a/cli/Valet/Site.php +++ b/cli/Valet/Site.php @@ -136,7 +136,7 @@ function secure($url) $this->createCertificate($url); $this->files->putAsUser( - VALET_HOME_PATH.'/Caddy/'.$url, $this->buildSecureCaddyfile($url) + VALET_HOME_PATH.'/Nginx/'.$url, $this->buildSecureNginxServer($url) ); } @@ -201,18 +201,19 @@ function trustCertificate($crtPath) } /** - * Build the TLS secured Caddyfile for the given URL. + * Build the TLS secured Nginx server for the given URL. * * @param string $url * @return string */ - function buildSecureCaddyfile($url) + function buildSecureNginxServer($url) { $path = $this->certificatesPath(); return str_replace( - ['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') + ['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/secure.valet.conf') ); } @@ -225,7 +226,7 @@ function buildSecureCaddyfile($url) function unsecure($url) { if ($this->files->exists($this->certificatesPath().'/'.$url.'.crt')) { - $this->files->unlink(VALET_HOME_PATH.'/Caddy/'.$url); + $this->files->unlink(VALET_HOME_PATH.'/Nginx/'.$url); $this->files->unlink($this->certificatesPath().'/'.$url.'.key'); $this->files->unlink($this->certificatesPath().'/'.$url.'.csr'); diff --git a/cli/includes/facades.php b/cli/includes/facades.php index 2488185..6521054 100644 --- a/cli/includes/facades.php +++ b/cli/includes/facades.php @@ -26,7 +26,7 @@ public static function __callStatic($method, $parameters) } class Brew extends Facade {} -class Caddy extends Facade {} +class Nginx extends Facade {} class CommandLine extends Facade {} class Configuration extends Facade {} class DnsMasq extends Facade {} diff --git a/cli/stubs/Caddyfile b/cli/stubs/Caddyfile deleted file mode 100644 index f092f28..0000000 --- a/cli/stubs/Caddyfile +++ /dev/null @@ -1,32 +0,0 @@ -import VALET_HOME_PATH/Caddy/* - -:80 { - root / - - # Slight hack, see: https://github.com/mholt/caddy/issues/1020 - internal /dev/null - - fastcgi / 127.0.0.1:9000 php { - index VALET_SERVER_PATH - } - - rewrite { - to VALET_SERVER_PATH?{query} - } - - log VALET_HOME_PATH/Log/access.log { - rotate { - size 10 - age 3 - keep 1 - } - } - - errors { - log VALET_HOME_PATH/Log/error.log { - size 10 - age 3 - keep 1 - } - } -} diff --git a/cli/stubs/SecureCaddyfile b/cli/stubs/SecureCaddyfile deleted file mode 100644 index 34da0e6..0000000 --- a/cli/stubs/SecureCaddyfile +++ /dev/null @@ -1,36 +0,0 @@ -http://VALET_SITE:80 { - redir https://{host}{uri} -} - -https://VALET_SITE:443 { - root / - - # Slight hack, see: https://github.com/mholt/caddy/issues/1020 - internal /dev/null - - tls VALET_CERT VALET_KEY - - fastcgi / 127.0.0.1:9000 php { - index VALET_SERVER_PATH - } - - rewrite { - to VALET_SERVER_PATH?{query} - } - - log VALET_HOME_PATH/Log/access.log { - rotate { - size 10 - age 3 - keep 1 - } - } - - errors { - log VALET_HOME_PATH/Log/error.log { - size 10 - age 3 - keep 1 - } - } -} diff --git a/cli/stubs/daemon.plist b/cli/stubs/daemon.plist deleted file mode 100644 index 5f3a3f5..0000000 --- a/cli/stubs/daemon.plist +++ /dev/null @@ -1,19 +0,0 @@ - - - - - Label - com.laravel.valetServer - WorkingDirectory - VALET_PATH - ProgramArguments - - ./bin/caddy - --conf=VALET_HOME_PATH/Caddyfile - - RunAtLoad - - StandardErrorPath - /tmp/com.laravel.valetServer.err - - diff --git a/cli/stubs/fastcgi_params b/cli/stubs/fastcgi_params new file mode 100644 index 0000000..b4726b7 --- /dev/null +++ b/cli/stubs/fastcgi_params @@ -0,0 +1,20 @@ +fastcgi_param QUERY_STRING $query_string; +fastcgi_param REQUEST_METHOD $request_method; +fastcgi_param CONTENT_TYPE $content_type; +fastcgi_param CONTENT_LENGTH $content_length; +fastcgi_param SCRIPT_FILENAME $request_filename; +fastcgi_param SCRIPT_NAME $fastcgi_script_name; +fastcgi_param REQUEST_URI $request_uri; +fastcgi_param DOCUMENT_URI $document_uri; +fastcgi_param DOCUMENT_ROOT $document_root; +fastcgi_param SERVER_PROTOCOL $server_protocol; +fastcgi_param GATEWAY_INTERFACE CGI/1.1; +fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; +fastcgi_param REMOTE_ADDR $remote_addr; +fastcgi_param REMOTE_PORT $remote_port; +fastcgi_param SERVER_ADDR $server_addr; +fastcgi_param SERVER_PORT $server_port; +fastcgi_param SERVER_NAME $server_name; +fastcgi_param HTTPS $https if_not_empty; +fastcgi_param REDIRECT_STATUS 200; +fastcgi_param HTTP_PROXY ""; diff --git a/cli/stubs/nginx.conf b/cli/stubs/nginx.conf new file mode 100644 index 0000000..1857291 --- /dev/null +++ b/cli/stubs/nginx.conf @@ -0,0 +1,41 @@ +user VALET_USER staff; +worker_processes auto; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + + sendfile on; + keepalive_timeout 65; + + gzip on; + gzip_comp_level 5; + gzip_min_length 256; + gzip_proxied any; + gzip_vary on; + + gzip_types + application/atom+xml + application/javascript + application/json + application/rss+xml + application/vnd.ms-fontobject + application/x-font-ttf + application/x-web-app-manifest+json + application/xhtml+xml + application/xml + font/opentype + image/svg+xml + image/x-icon + text/css + text/plain + text/x-component; + + include VALET_HOME_PATH/Nginx/*; + include servers/*; + include valet/valet.conf; +} diff --git a/cli/stubs/secure.valet.conf b/cli/stubs/secure.valet.conf new file mode 100644 index 0000000..cde49b3 --- /dev/null +++ b/cli/stubs/secure.valet.conf @@ -0,0 +1,44 @@ +server { + listen 80; + server_name VALET_SITE; + return 301 https://$host$request_uri; +} + +server { + listen 443 ssl http2; + server_name VALET_SITE; + root /; + charset utf-8; + + location /static/ { + internal; + alias /; + try_files $uri $uri/; + } + + ssl_certificate VALET_CERT; + ssl_certificate_key VALET_KEY; + + location / { + rewrite ^ VALET_SERVER_PATH?$query_string last; + } + + location = /favicon.ico { access_log off; log_not_found off; } + location = /robots.txt { access_log off; log_not_found off; } + + access_log off; + error_log VALET_HOME_PATH/Log/nginx-error.log; + + error_page 404 VALET_SERVER_PATH; + + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:VALET_HOME_PATH/valet.sock; + fastcgi_index VALET_SERVER_PATH; + include fastcgi_params; + } + + location ~ /\.ht { + deny all; + } +} diff --git a/cli/stubs/valet.conf b/cli/stubs/valet.conf index 42c05c7..b0adc08 100644 --- a/cli/stubs/valet.conf +++ b/cli/stubs/valet.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 80 default_server; root /; charset utf-8; @@ -25,35 +25,7 @@ server { fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:VALET_HOME_PATH/valet.sock; fastcgi_index VALET_SERVER_PATH; - - fastcgi_param QUERY_STRING $query_string; - fastcgi_param REQUEST_METHOD $request_method; - fastcgi_param CONTENT_TYPE $content_type; - fastcgi_param CONTENT_LENGTH $content_length; - - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_param SCRIPT_NAME $fastcgi_script_name; - fastcgi_param REQUEST_URI $request_uri; - fastcgi_param DOCUMENT_URI $document_uri; - fastcgi_param DOCUMENT_ROOT $document_root; - fastcgi_param SERVER_PROTOCOL $server_protocol; - - fastcgi_param GATEWAY_INTERFACE CGI/1.1; - fastcgi_param SERVER_SOFTWARE nginx/$nginx_version; - - fastcgi_param REMOTE_ADDR $remote_addr; - fastcgi_param REMOTE_PORT $remote_port; - fastcgi_param SERVER_ADDR $server_addr; - fastcgi_param SERVER_PORT $server_port; - fastcgi_param SERVER_NAME $server_name; - - fastcgi_param HTTPS $https if_not_empty; - - # PHP only, required if PHP was built with --enable-force-cgi-redirect - fastcgi_param REDIRECT_STATUS 200; - - fastcgi_param HTTP_PROXY ""; - + include fastcgi_params; } location ~ /\.ht { diff --git a/cli/valet.php b/cli/valet.php index 9284a22..f858ec3 100755 --- a/cli/valet.php +++ b/cli/valet.php @@ -35,13 +35,13 @@ * Allow Valet to be run more conveniently by allowing the Node proxy to run password-less sudo. */ $app->command('install', function () { - Caddy::stop(); + Nginx::stop(); Configuration::install(); - Caddy::install(); + Nginx::install(); PhpFpm::install(); DnsMasq::install(); - Caddy::restart(); + Nginx::restart(); Valet::symlinkToUsersBin(); Brew::createSudoersEntry(); Valet::createSudoersEntry(); @@ -65,7 +65,7 @@ Site::resecureForNewDomain($oldDomain, $domain); PhpFpm::restart(); - Caddy::restart(); + Nginx::restart(); info('Your Valet domain has been updated to ['.$domain.'].'); })->descriptions('Get or set the domain used for Valet sites'); @@ -123,7 +123,7 @@ PhpFpm::restart(); - Caddy::restart(); + Nginx::restart(); info('The ['.$url.'] site has been secured with a fresh TLS certificate.'); })->descriptions('Secure the given domain with a trusted TLS certificate'); @@ -138,7 +138,7 @@ PhpFpm::restart(); - Caddy::restart(); + Nginx::restart(); info('The ['.$url.'] site will now serve traffic over HTTP.'); })->descriptions('Stop serving the given domain over HTTPS and remove the trusted TLS certificate'); @@ -158,23 +158,6 @@ } })->descriptions('Determine which Valet driver serves the current working directory'); -/** - * Stream the Caddy access and error logs. - */ -$app->command('server-log', function () { - $files = Filesystem::scandir(VALET_HOME_PATH.'/Log'); - - $args = collect($files)->map(function ($file) { - return escapeshellarg(VALET_HOME_PATH.'/Log/'.$file); - })->implode(' '); - - if (count($files) > 0) { - passthru("tail -f {$args}"); - } else { - warning('No log files were found.'); - } -})->descriptions('Stream Caddy access- and error-log.'); - /** * Display all of the registered paths. */ @@ -217,7 +200,7 @@ $app->command('start', function () { PhpFpm::restart(); - Caddy::restart(); + Nginx::restart(); info('Valet services have been started.'); })->descriptions('Start the Valet services'); @@ -228,7 +211,7 @@ $app->command('restart', function () { PhpFpm::restart(); - Caddy::restart(); + Nginx::restart(); info('Valet services have been restarted.'); })->descriptions('Restart the Valet services'); @@ -239,7 +222,7 @@ $app->command('stop', function () { PhpFpm::stop(); - Caddy::stop(); + Nginx::stop(); info('Valet services have been stopped.'); })->descriptions('Stop the Valet services'); @@ -248,7 +231,7 @@ * Uninstall Valet entirely. */ $app->command('uninstall', function () { - Caddy::uninstall(); + Nginx::uninstall(); info('Valet has been uninstalled.'); })->descriptions('Uninstall the Valet services');