Rename system directory to flarum

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "system/core"]
+[submodule "flarum/core"]
-	path = system/core
+	path = flarum/core
 	url = https://github.com/flarum/core.git

admin.php

@@ -7,7 +7,7 @@ use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 
 // Instantiate the application, register providers etc.
-$app = require __DIR__.'/system/bootstrap.php';
+$app = require __DIR__.'/flarum/bootstrap.php';
 
 // Set up everything we need for the frontend
 $app->register('Flarum\Admin\AdminServiceProvider');

api.php

@@ -7,7 +7,7 @@ use Zend\Diactoros\Server;
 use Zend\Stratigility\MiddlewarePipe;
 
 // Instantiate the application, register providers etc.
-$app = require __DIR__.'/system/bootstrap.php';
+$app = require __DIR__.'/flarum/bootstrap.php';
 
 // Set up everything we need for the API
 $app->register('Flarum\Api\ApiServiceProvider');

flarum/bootstrap.php

@@ -28,12 +28,12 @@ $app->instance('config', $config = new \Illuminate\Config\Repository([
 	],
 	'mail' => [
 		'driver' => 'smtp',
-		'host' => 'smtp.mailgun.org',
+		'host' => 'mailtrap.io',
-		'port' => 587,
+		'port' => 25,
-		'from' => ['address' => 'noreply@localhost', 'name' => 'Flarum Demo Forum'],
+		'from' => ['address' => 'noreply@flarum.org', 'name' => 'Flarum Demo Forum'],
 		'encryption' => 'tls',
-		'username' => null,
+		'username' => '3041435124c4c166c',
-		'password' => null,
+		'password' => 'a6949720835285',
 		'sendmail' => '/usr/sbin/sendmail -bs',
 		'pretend' => false,
 	],

flarum/composer.json

@@ -7,7 +7,8 @@
 	"require": {
 		"laravel/framework": "5.1.*",
 		"zendframework/zend-stratigility": "^1.1",
-		"franzl/whoops-middleware": "dev-master"
+		"franzl/whoops-middleware": "dev-master",
+    "flarum/core": "0.1.x@dev"
 	},
 	"require-dev": {
 		"franzl/studio": "1.0.x@dev"

system/.env.example

@@ -1,17 +0,0 @@
-APP_ENV=local
-APP_DEBUG=true
-APP_KEY=SomeRandomString
-
-DB_HOST=localhost
-DB_DATABASE=flarum
-DB_USERNAME=root
-DB_PASSWORD=root
-
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null

system/core

@@ -1 +0,0 @@
-Subproject commit 0cb3378658b4a6ff3b4a8d5a06378ae8b6c5b87a