fix conclits

taylorotwell · taylorotwell · commit 48fb9517d2a1 · 2015-12-07T12:04:59.000-06:00
diff --git a/.env.example b/.env.example
@@ -11,6 +11,10 @@ CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
 
+REDIS_HOST=localhost
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
 MAIL_DRIVER=smtp
 MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
diff --git a/config/database.php b/config/database.php
@@ -116,9 +116,10 @@
         'cluster' => false,
 
         'default' => [
-            'host'     => env('REDIS_HOST', '127.0.0.1'),
+            'host'     => env('REDIS_HOST', 'localhost'),
+            'password' => env('REDIS_PASSWORD', ''),
             'port'     => env('REDIS_PORT', 6379),
-            'database' => env('REDIS_DB', 0),
+            'database' => 0,
         ],
 
     ],
diff --git a/public/web.config b/public/web.config
@@ -0,0 +1,23 @@
+<configuration>
+  <system.webServer>
+    <rewrite>
+      <rules>
+        <rule name="Imported Rule 1" stopProcessing="true">
+          <match url="^(.*)/$" ignoreCase="false" />
+          <conditions>
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
+          </conditions>
+          <action type="Redirect" redirectType="Permanent" url="/{R:1}" />
+        </rule>
+        <rule name="Imported Rule 2" stopProcessing="true">
+          <match url="^" ignoreCase="false" />
+          <conditions>
+            <add input="{REQUEST_FILENAME}" matchType="IsDirectory" ignoreCase="false" negate="true" />
+            <add input="{REQUEST_FILENAME}" matchType="IsFile" ignoreCase="false" negate="true" />
+          </conditions>
+	  <action type="Rewrite" url="index.php" />
+        </rule>
+      </rules>
+    </rewrite>
+  </system.webServer>
+</configuration>
