From 703777f136c5da217e7dc0dd9382febab55ab7c7 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Jan 2022 07:50:03 +1100 Subject: [PATCH 1/2] Add .env file back in --- .env.example | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ VERSION.txt | 2 +- config/ninja.php | 4 ++-- 3 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 .env.example diff --git a/.env.example b/.env.example new file mode 100644 index 0000000000..0402990877 --- /dev/null +++ b/.env.example @@ -0,0 +1,57 @@ +APP_NAME="Invoice Ninja" +APP_ENV=production +APP_KEY= +APP_DEBUG=false + +APP_URL=http://localhost + +DB_CONNECTION=mysql +MULTI_DB_ENABLED=false + +DB_HOST=localhost +DB_DATABASE=ninja +DB_USERNAME=ninja +DB_PASSWORD=ninja +DB_PORT=3306 + +DEMO_MODE=false + +BROADCAST_DRIVER=log +LOG_CHANNEL=stack +CACHE_DRIVER=file +QUEUE_CONNECTION=sync +SESSION_DRIVER=file +SESSION_LIFETIME=120 + +REDIS_HOST=127.0.0.1 +REDIS_PASSWORD=null +REDIS_PORT=6379 + +MAIL_MAILER=smtp +MAIL_HOST=smtp.mailtrap.io +MAIL_PORT=2525 +MAIL_USERNAME=null +MAIL_PASSWORD=null +MAIL_ENCRYPTION=null +MAIL_FROM_ADDRESS='user@example.com' +MAIL_FROM_NAME='Self Hosted User' + +POSTMARK_API_TOKEN= +REQUIRE_HTTPS=false + +GOOGLE_MAPS_API_KEY= +ERROR_EMAIL= +TRUSTED_PROXIES= + +NINJA_ENVIRONMENT=selfhost + +#options - snappdf / phantom / hosted_ninja +PDF_GENERATOR=phantom + +PHANTOMJS_KEY='a-demo-key-with-low-quota-per-ip-address' +PHANTOMJS_SECRET=secret + +UPDATE_SECRET=secret + +COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' +SENTRY_LARAVEL_DSN=http://39389664f3f14969b4c43dadda00a40b@sentry2.invoicing.co/5 \ No newline at end of file diff --git a/VERSION.txt b/VERSION.txt index 0eb5fb01a6..b6d99a4aca 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.3.51 \ No newline at end of file +5.3.52 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 0999c644e8..14d1578f1b 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,8 +14,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'), - 'app_version' => '5.3.51', - 'app_tag' => '5.3.51', + 'app_version' => '5.3.52', + 'app_tag' => '5.3.52', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), From e18fb3a6f16af63a34d597d1a9bbb917fae458cb Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 Jan 2022 07:57:11 +1100 Subject: [PATCH 2/2] Fixes for sentry DSN --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 0402990877..69001f07b2 100644 --- a/.env.example +++ b/.env.example @@ -54,4 +54,4 @@ PHANTOMJS_SECRET=secret UPDATE_SECRET=secret COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}' -SENTRY_LARAVEL_DSN=http://39389664f3f14969b4c43dadda00a40b@sentry2.invoicing.co/5 \ No newline at end of file +SENTRY_LARAVEL_DSN=https://39389664f3f14969b4c43dadda00a40b@sentry2.invoicing.co/5 \ No newline at end of file