From 177d5f512b6edea312e7bc2ddc0354085cdfaa60 Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylorotwell@gmail.com>
Date: Sat, 7 May 2016 07:30:14 -0500
Subject: [PATCH] move caddy

---
 caddy => bin/caddy           | Bin
 src/CaddyFile.php            |  16 ++++++++++++++++
 src/LaunchDaemon.php         |   2 ++
 Caddyfile => stubs/Caddyfile |   0
 stubs/daemon.plist           |   3 ++-
 valet.php                    |   4 +++-
 6 files changed, 23 insertions(+), 2 deletions(-)
 rename caddy => bin/caddy (100%)
 create mode 100644 src/CaddyFile.php
 rename Caddyfile => stubs/Caddyfile (100%)

diff --git a/caddy b/bin/caddy
similarity index 100%
rename from caddy
rename to bin/caddy
diff --git a/src/CaddyFile.php b/src/CaddyFile.php
new file mode 100644
index 0000000..5fb6447
--- /dev/null
+++ b/src/CaddyFile.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Valet;
+
+class CaddyFile
+{
+    /**
+     * Install the Caddy configuration file.
+     *
+     * @return void
+     */
+    public static function install()
+    {
+        copy(__DIR__.'/../stubs/Caddyfile', VALET_HOME_PATH.'/Caddyfile');
+    }
+}
diff --git a/src/LaunchDaemon.php b/src/LaunchDaemon.php
index 23e0f35..56c2c44 100644
--- a/src/LaunchDaemon.php
+++ b/src/LaunchDaemon.php
@@ -15,6 +15,8 @@ public static function install()
             'VALET_PATH', realpath(__DIR__.'/../'), file_get_contents(__DIR__.'/../stubs/daemon.plist')
         );
 
+        $contents = str_replace('VALET_HOME_PATH', VALET_HOME_PATH, $contents);
+
         file_put_contents('/Library/LaunchDaemons/com.laravel.valetServer.plist', $contents);
     }
 
diff --git a/Caddyfile b/stubs/Caddyfile
similarity index 100%
rename from Caddyfile
rename to stubs/Caddyfile
diff --git a/stubs/daemon.plist b/stubs/daemon.plist
index 2e82077..5f3a3f5 100644
--- a/stubs/daemon.plist
+++ b/stubs/daemon.plist
@@ -8,7 +8,8 @@
     <string>VALET_PATH</string>
     <key>ProgramArguments</key>
     <array>
-        <string>./caddy</string>
+        <string>./bin/caddy</string>
+        <string>--conf=VALET_HOME_PATH/Caddyfile</string>
     </array>
     <key>RunAtLoad</key>
     <true/>
diff --git a/valet.php b/valet.php
index 9847794..43bd0aa 100755
--- a/valet.php
+++ b/valet.php
@@ -35,9 +35,11 @@
 
     Valet\LaunchDaemon::stop();
 
+    Valet\Configuration::install();
+
     Valet\LaunchDaemon::install();
 
-    Valet\Configuration::install();
+    Valet\CaddyFile::install();
 
     Valet\PhpFpm::install($output);