diff --git a/.env.docker b/.env.docker index c4a8aa52..989d0437 100644 --- a/.env.docker +++ b/.env.docker @@ -44,6 +44,8 @@ AWS_BUCKET= ## Mail configuration +MAIL_FROM_ADDRESS=your@email.com +MAIL_FROM_NAME=LinkAce # Set the driver used for sending email here, default is `smtp` MAIL_DRIVER=smtp # Set the SMTP host and its port here diff --git a/.env.docker.production b/.env.docker.production index 08f462c7..7395c744 100644 --- a/.env.docker.production +++ b/.env.docker.production @@ -44,6 +44,8 @@ AWS_BUCKET= ## Mail configuration +MAIL_FROM_ADDRESS=your@email.com +MAIL_FROM_NAME=LinkAce # Set the driver used for sending email here, default is `smtp` MAIL_DRIVER=smtp # Set the SMTP host and its port here diff --git a/.env.example b/.env.example index c3d65b2c..55914b5a 100644 --- a/.env.example +++ b/.env.example @@ -41,6 +41,8 @@ AWS_BUCKET= ## Mail configuration +MAIL_FROM_ADDRESS=your@email.com +MAIL_FROM_NAME=LinkAce # Set the driver used for sending email here, default is `smtp` MAIL_DRIVER=smtp # Set the SMTP host and its port here diff --git a/config/backup.php b/config/backup.php index e873c193..b2f0acee 100644 --- a/config/backup.php +++ b/config/backup.php @@ -10,7 +10,7 @@ return [ * The name of this application. You can use this name to monitor * the backups. */ - 'name' => env('APP_NAME', 'laravel-backup'), + 'name' => env('APP_NAME', 'linkace-backup'), 'source' => [ @@ -168,7 +168,7 @@ return [ */ 'monitor_backups' => [ [ - 'name' => env('APP_NAME', 'laravel-backup'), + 'name' => env('APP_NAME', 'linkace-backup'), 'disks' => [env('BACKUP_DISK', 'local_backups')], 'health_checks' => [ \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumAgeInDays::class => 1, diff --git a/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile b/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile index b0d3e7c2..60f61e33 100644 --- a/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile +++ b/resources/docker/dockerfiles/release-multiplatform-simple.Dockerfile @@ -84,6 +84,10 @@ COPY --from=builder /app/bootstrap/cache /app/bootstrap/cache # Publish package resources RUN php artisan vendor:publish --provider="Spatie\Backup\BackupServiceProvider" +RUN mv vendor/spatie/laravel-backup/resources/lang/en vendor/spatie/laravel-backup/resources/lang/en_US; \ + mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-backup/resources/lang/de_DE; \ + mv vendor/spatie/laravel-backup/resources/lang/fr vendor/spatie/laravel-backup/resources/lang/fr_FR; \ + mv vendor/spatie/laravel-backup/resources/lang/zh-CN vendor/spatie/laravel-backup/resources/lang/zh_CN # Copy files from the theme build COPY --from=npm_builder /srv/public/assets/dist/js /app/public/assets/dist/js diff --git a/resources/docker/dockerfiles/release-multiplatform.Dockerfile b/resources/docker/dockerfiles/release-multiplatform.Dockerfile index 71e4c080..89937738 100644 --- a/resources/docker/dockerfiles/release-multiplatform.Dockerfile +++ b/resources/docker/dockerfiles/release-multiplatform.Dockerfile @@ -69,7 +69,6 @@ RUN apk add --no-cache mariadb-client postgresql postgresql-dev zip libzip-dev ; # Copy the PHP and nginx config files COPY ./resources/docker/php/php.ini /usr/local/etc/php/php.ini -COPY ./resources/docker/nginx/nginx.conf /etc/nginx/conf.d/default.conf # Copy files from the composer build COPY --from=builder /app/vendor /app/vendor @@ -77,6 +76,10 @@ COPY --from=builder /app/bootstrap/cache /app/bootstrap/cache # Publish package resources RUN php artisan vendor:publish --provider="Spatie\Backup\BackupServiceProvider" +RUN mv vendor/spatie/laravel-backup/resources/lang/en vendor/spatie/laravel-backup/resources/lang/en_US; \ + mv vendor/spatie/laravel-backup/resources/lang/de vendor/spatie/laravel-backup/resources/lang/de_DE; \ + mv vendor/spatie/laravel-backup/resources/lang/fr vendor/spatie/laravel-backup/resources/lang/fr_FR; \ + mv vendor/spatie/laravel-backup/resources/lang/zh-CN vendor/spatie/laravel-backup/resources/lang/zh_CN # Copy files from the theme build COPY --from=npm_builder /srv/public/assets/dist/js /app/public/assets/dist/js