From 4a25c72c7a9714a76c6f64ce79febb325b7924ac Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Fri, 3 Apr 2015 02:02:45 +0200
Subject: [PATCH] Get rid of public directory.

---
 public/.htaccess => .htaccess                | 0
 Vagrantfile                                  | 2 +-
 {public => assets}/flarum/.gitignore         | 0
 {public => assets}/flarum/avatars/.gitignore | 0
 public/index.php => index.php                | 4 ++--
 server.php                                   | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename public/.htaccess => .htaccess (100%)
 rename {public => assets}/flarum/.gitignore (100%)
 rename {public => assets}/flarum/avatars/.gitignore (100%)
 rename public/index.php => index.php (94%)

diff --git a/public/.htaccess b/.htaccess
similarity index 100%
rename from public/.htaccess
rename to .htaccess
diff --git a/Vagrantfile b/Vagrantfile
index 3c8fb67..aa350ba 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -60,7 +60,7 @@ composer_packages     = [        # List any global Composer packages that you wa
 # Default web server document root
 # Symfony's public directory is assumed "web"
 # Laravel's public directory is assumed "public"
-public_folder         = "/vagrant/public"
+public_folder         = "/vagrant"
 
 laravel_root_folder   = "/vagrant/laravel" # Where to install Laravel. Will `composer install` if a composer.json file exists
 laravel_version       = "latest-stable" # If you need a specific version of Laravel, set it here
diff --git a/public/flarum/.gitignore b/assets/flarum/.gitignore
similarity index 100%
rename from public/flarum/.gitignore
rename to assets/flarum/.gitignore
diff --git a/public/flarum/avatars/.gitignore b/assets/flarum/avatars/.gitignore
similarity index 100%
rename from public/flarum/avatars/.gitignore
rename to assets/flarum/avatars/.gitignore
diff --git a/public/index.php b/index.php
similarity index 94%
rename from public/index.php
rename to index.php
index 05322e9..4dfe471 100644
--- a/public/index.php
+++ b/index.php
@@ -18,7 +18,7 @@
 |
 */
 
-require __DIR__.'/../bootstrap/autoload.php';
+require __DIR__ . '/bootstrap/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -32,7 +32,7 @@ require __DIR__.'/../bootstrap/autoload.php';
 |
 */
 
-$app = require_once __DIR__.'/../bootstrap/app.php';
+$app = require_once __DIR__ . '/bootstrap/app.php';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/server.php b/server.php
index 8f37587..2c9f592 100644
--- a/server.php
+++ b/server.php
@@ -18,4 +18,4 @@ if ($uri !== '/' and file_exists(__DIR__.'/public'.$uri))
 	return false;
 }
 
-require_once __DIR__.'/public/index.php';
+require_once __DIR__ . '/index.php';