Allow forceHttps to be disabled, fixes pixelfed#3710

yourivdlans · Jul 7, 2023 · 282c270 · 282c270
1 parent 3c3aa3b
commit 282c270
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -40,9 +40,10 @@ class AppServiceProvider extends ServiceProvider
 	 */
 	public function boot()
 	{
-		if (preg_match("/^https/", env('APP_URL')) || env('APP_ENV') === 'production') {
+		if(config('instance.force_https_urls')) {
 			URL::forceScheme('https');
 		}
+
 		Schema::defaultStringLength(191);
 		Paginator::useBootstrap();
 		Avatar::observe(AvatarObserver::class);

diff --git a/config/instance.php b/config/instance.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+	'force_https_urls' => env('FORCE_HTTPS_URLS', true),
 
 	'description' => env('INSTANCE_DESCRIPTION', 'Pixelfed - Photo sharing for everyone'),