From e3e8336602b861c3c3aa88e695e7a98beac438cd Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Wed, 1 Aug 2018 07:24:19 +0200
Subject: [PATCH] Update some code for Heroku.

---
 .env.heroku                          | 2 +-
 app/Providers/AppServiceProvider.php | 5 ++++-
 nginx_app.conf                       | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.env.heroku b/.env.heroku
index 55237bd98b..13de7aa0b4 100644
--- a/.env.heroku
+++ b/.env.heroku
@@ -36,7 +36,7 @@ DB_CONNECTION=pgsql
 # 'daily' is the default logging mode giving you 5 daily rotated log files in /storage/logs/.
 # Several other options exist. You can use 'single' for one big fat error log (not recommended).
 # Also available are 'syslog' and 'errorlog' which will log to the system itself.
-APP_LOG=errorlog
+APP_LOG=syslog
 
 # Log level. You can set this from least severe to most severe:
 # debug, info, notice, warning, error, critical, alert, emergency
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index 30247d8ee0..d91edc80e3 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -25,7 +25,7 @@ namespace FireflyIII\Providers;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Passport\Passport;
-
+use URL;
 /**
  * @codeCoverageIgnore
  * Class AppServiceProvider.
@@ -38,6 +38,9 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Schema::defaultStringLength(191);
+        if('heroku' === env('APP_ENV')) {
+            URL::forceScheme('https');
+        }
     }
 
     /**
diff --git a/nginx_app.conf b/nginx_app.conf
index 97bdb62378..39dedf0155 100644
--- a/nginx_app.conf
+++ b/nginx_app.conf
@@ -2,6 +2,9 @@
 fastcgi_param HTTP_PROXY "";
 
 location / {
+    if ($http_x_forwarded_proto != "https") {
+        return 301 https://$host$request_uri;
+    }
     # try to serve file directly, fallback to rewrite
     try_files $uri @rewriteapp;
 }