Commit 1173e192 authored by Taylor Otwell's avatar Taylor Otwell

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

parents 6722b100 a33c66cf
...@@ -17,3 +17,7 @@ MAIL_PORT=2525 ...@@ -17,3 +17,7 @@ MAIL_PORT=2525
MAIL_USERNAME=null MAIL_USERNAME=null
MAIL_PASSWORD=null MAIL_PASSWORD=null
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=null
REDIS_HOST=localhost
REDiS_KEY=
REDIS_PORT=6379
...@@ -116,8 +116,9 @@ return [ ...@@ -116,8 +116,9 @@ return [
'cluster' => false, 'cluster' => false,
'default' => [ 'default' => [
'host' => '127.0.0.1', 'host' => env('REDIS_HOST', 'localhost'),
'port' => 6379, 'password' => env('REDIS_KEY', ''),
'port' => env('REDIS_PORT', 6379),
'database' => 0, 'database' => 0,
], ],
......
<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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment