diff --git a/.env.development.example b/.env.development.example index 24f8200b5..55457a6d6 100644 --- a/.env.development.example +++ b/.env.development.example @@ -15,7 +15,6 @@ RAY_PORT=8001 ############################################################################################################ APP_NAME=Coolify -APP_SERVICE=php APP_ENV=local APP_KEY= APP_DEBUG=true diff --git a/.env.production b/.env.production index 1582d7b38..521e33171 100644 --- a/.env.production +++ b/.env.production @@ -1,26 +1,5 @@ -SELF_HOSTED=true - -SENTRY_LARAVEL_DSN=https://fc21c062604d4526a4a9f263a0addeac@o1082494.ingest.sentry.io/4504672605372416 -SENTRY_TRACES_SAMPLE_RATE=0.2 - APP_NAME=Coolify -APP_SERVICE=php -APP_ENV=production APP_KEY= -APP_DEBUG=false -APP_PORT=8000 -SESSION_DRIVER=database - -DB_CONNECTION=pgsql -DB_HOST=postgres -DB_PORT=5432 -DB_DATABASE=coolify -DB_USERNAME=coolify DB_PASSWORD= - -QUEUE_CONNECTION=redis -REDIS_HOST=coolify-redis REDIS_PASSWORD= - -CACHE_DRIVER=redis diff --git a/app/Notifications/TransactionalEmails/ResetPasswordEmail.php b/app/Notifications/TransactionalEmails/ResetPasswordEmail.php deleted file mode 100644 index 6a02a3f43..000000000 --- a/app/Notifications/TransactionalEmails/ResetPasswordEmail.php +++ /dev/null @@ -1,40 +0,0 @@ -token = $token; - } - public function via() - { - return [TransactionalEmailChannel::class]; - } - - public function toMail(User $user): MailMessage - { - if (config('app.env') === 'local') { - $url = url('/') . ":8000" . '/reset-password/' . $this->token . '?email=' . $user->email; - } else { - $url = url('/') . '/reset-password/' . $this->token . '?email=' . $user->email; - } - $mail = new MailMessage(); - $mail->subject('Reset Password'); - $mail->view('emails.reset-password', [ - 'user' => $user, - 'url' => $url, - ]); - return $mail; - } -} diff --git a/config/cache.php b/config/cache.php index 33bb29546..a0eba14c1 100644 --- a/config/cache.php +++ b/config/cache.php @@ -15,7 +15,7 @@ | */ - 'default' => env('CACHE_DRIVER', 'file'), + 'default' => env('CACHE_DRIVER', 'redis'), /* |-------------------------------------------------------------------------- @@ -105,6 +105,6 @@ | */ - 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'), + 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_cache_'), ]; diff --git a/config/database.php b/config/database.php index 137ad18ce..504a5b2f3 100644 --- a/config/database.php +++ b/config/database.php @@ -15,7 +15,7 @@ | */ - 'default' => env('DB_CONNECTION', 'mysql'), + 'default' => env('DB_CONNECTION', 'pgsql'), /* |-------------------------------------------------------------------------- @@ -66,10 +66,10 @@ 'pgsql' => [ 'driver' => 'pgsql', 'url' => env('DATABASE_URL'), - 'host' => env('DB_HOST', '127.0.0.1'), + 'host' => env('DB_HOST', 'postgres'), 'port' => env('DB_PORT', '5432'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), + 'database' => env('DB_DATABASE', 'coolify'), + 'username' => env('DB_USERNAME', 'coolify'), 'password' => env('DB_PASSWORD', ''), 'charset' => 'utf8', 'prefix' => '', @@ -125,12 +125,12 @@ 'options' => [ 'cluster' => env('REDIS_CLUSTER', 'redis'), - 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'), + 'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'), ], 'default' => [ 'url' => env('REDIS_URL'), - 'host' => env('REDIS_HOST', '127.0.0.1'), + 'host' => env('REDIS_HOST', 'coolify-redis'), 'username' => env('REDIS_USERNAME'), 'password' => env('REDIS_PASSWORD'), 'port' => env('REDIS_PORT', '6379'), @@ -139,7 +139,7 @@ 'cache' => [ 'url' => env('REDIS_URL'), - 'host' => env('REDIS_HOST', '127.0.0.1'), + 'host' => env('REDIS_HOST', 'coolify-redis'), 'username' => env('REDIS_USERNAME'), 'password' => env('REDIS_PASSWORD'), 'port' => env('REDIS_PORT', '6379'), diff --git a/config/queue.php b/config/queue.php index 25ea5a819..a7a3d46f8 100644 --- a/config/queue.php +++ b/config/queue.php @@ -13,7 +13,7 @@ | */ - 'default' => env('QUEUE_CONNECTION', 'sync'), + 'default' => env('QUEUE_CONNECTION', 'redis'), /* |-------------------------------------------------------------------------- @@ -86,7 +86,7 @@ 'failed' => [ 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'), - 'database' => env('DB_CONNECTION', 'mysql'), + 'database' => env('DB_CONNECTION', 'pgsql'), 'table' => 'failed_jobs', ], diff --git a/config/sentry.php b/config/sentry.php index bbf98c83d..a1e21463f 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -3,11 +3,11 @@ return [ // @see https://docs.sentry.io/product/sentry-basics/dsn-explainer/ - 'dsn' => env('SENTRY_LARAVEL_DSN', env('SENTRY_DSN')), + 'dsn' => 'https://fc21c062604d4526a4a9f263a0addeac@o1082494.ingest.sentry.io/4504672605372416', // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => env('SENTRY_RELEASE'), + 'release' => config('version'), // When left empty or `null` the Laravel environment will be used 'environment' => env('SENTRY_ENVIRONMENT'), @@ -77,7 +77,7 @@ 'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false), // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate - 'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_TRACES_SAMPLE_RATE'), + 'traces_sample_rate' => 0.2, 'profiles_sample_rate' => env('SENTRY_PROFILES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_PROFILES_SAMPLE_RATE'), diff --git a/config/session.php b/config/session.php index b6f484a9d..1289805b9 100644 --- a/config/session.php +++ b/config/session.php @@ -18,7 +18,7 @@ | */ - 'driver' => env('SESSION_DRIVER', 'file'), + 'driver' => env('SESSION_DRIVER', 'database'), /* |--------------------------------------------------------------------------