Merge branch 'master' of https://github.com/SyntaxC4/laravel into SyntaxC4-master

taylorotwell · taylorotwell · commit 1173e19293d8 · 2015-12-07T12:02:49.000-06:00
diff --git a/.env.example b/.env.example
@@ -17,3 +17,7 @@ MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+
+REDIS_HOST=localhost
+REDiS_KEY=
+REDIS_PORT=6379
diff --git a/config/database.php b/config/database.php
@@ -116,8 +116,9 @@
         'cluster' => false,
 
         'default' => [
-            'host'     => '127.0.0.1',
-            'port'     => 6379,
+            'host'     => env('REDIS_HOST', 'localhost'),
+            'password' => env('REDIS_KEY', ''),
+            'port'     => env('REDIS_PORT', 6379),
             '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>
