From 8b9da9be318c2790933735e622edeac22a928d31 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Sun, 28 Oct 2018 23:12:45 +0100
Subject: [PATCH] Configure all paths explicitly

Suggested by @tobscure below commit dfebb5c8ca3306f8dd26003d79ba3d0c830f3081.
---
 flarum           | 6 +++++-
 public/index.php | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/flarum b/flarum
index 98ad332..f5de4aa 100644
--- a/flarum
+++ b/flarum
@@ -12,7 +12,11 @@
 require 'vendor/autoload.php';
 
 $server = new Flarum\Console\Server(
-    Flarum\Foundation\Site::fromDefaultBase(__DIR__)
+    Flarum\Foundation\Site::fromPaths([
+        'base' => __DIR__,
+        'public' => __DIR__.'/public',
+        'storage' => __DIR__.'/storage',
+    ])
 );
 
 $server->listen();
diff --git a/public/index.php b/public/index.php
index 94a2924..b11dd72 100644
--- a/public/index.php
+++ b/public/index.php
@@ -12,7 +12,11 @@
 require '../vendor/autoload.php';
 
 $server = new Flarum\Http\Server(
-    Flarum\Foundation\Site::fromDefaultBase(__DIR__.'/..')
+    Flarum\Foundation\Site::fromPaths([
+        'base' => __DIR__.'/..',
+        'public' => __DIR__.'/../public',
+        'storage' => __DIR__.'/../storage',
+    ])
 );
 
 $server->listen();