webmaster/merchbay
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dev #1

Merged
webmaster merged 19 commits from dev into main 2025-12-22 15:28:43 +00:00
Conversation 0 Commits 19 Files Changed 59 +6 -1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e6ffc878dd - Show all commits

6
app/Providers/AppServiceProvider.php
View File

@@ -15,7 +15,11 @@ class AppServiceProvider extends ServiceProvider {
*/ */
public function boot() public function boot()
{ {
// // Force HTTPS URLs when behind a proxy (Traefik)
if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') {
\URL::forceSchema('https');
}
Blade::extend(function($value) { Blade::extend(function($value) {
return preg_replace('/\@define(.+)/', '<?php ${1}; ?>', $value); return preg_replace('/\@define(.+)/', '<?php ${1}; ?>', $value);
}); });

1
docker-compose.yml
View File

@@ -16,6 +16,7 @@ services:
- PROD_PRIVATE=${PROD_PRIVATE} - PROD_PRIVATE=${PROD_PRIVATE}
- IMAGES_URL=${IMAGES_URL} - IMAGES_URL=${IMAGES_URL}
- UPLOAD_URL=${UPLOAD_URL} - UPLOAD_URL=${UPLOAD_URL}
- FORCE_HTTPS=true
- MAIL_DRIVER=${MAIL_DRIVER} - MAIL_DRIVER=${MAIL_DRIVER}
- MAIL_HOST=${MAIL_HOST} - MAIL_HOST=${MAIL_HOST}
- MAIL_PORT=${MAIL_PORT} - MAIL_PORT=${MAIL_PORT}