From 7e30d761c5142210ace565ba97a21fb125fe5a9d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 10 Sep 2017 08:42:48 +0200 Subject: [PATCH] No longer necessary --- .env.sandstorm | 10 +++++----- .env.testing | 46 ---------------------------------------------- 2 files changed, 5 insertions(+), 51 deletions(-) delete mode 100755 .env.testing diff --git a/.env.sandstorm b/.env.sandstorm index ed8d9d511b..77d1aec95c 100755 --- a/.env.sandstorm +++ b/.env.sandstorm @@ -1,7 +1,6 @@ APP_ENV=production APP_DEBUG=true -APP_FORCE_SSL=false -APP_FORCE_ROOT= +APP_NAME=FireflyIII APP_KEY=SomeRandomStringOf32CharsExactly APP_LOG=syslog APP_LOG_LEVEL=debug @@ -28,7 +27,7 @@ REDIS_PASSWORD=null REDIS_PORT=6379 MAIL_DRIVER=smtp -MAIL_HOST=mailtrap.io +MAIL_HOST=smtp.mailtrap.io MAIL_PORT=2525 MAIL_FROM=changeme@example.com MAIL_USERNAME=null @@ -41,6 +40,8 @@ SHOW_INCOMPLETE_TRANSLATIONS=false CACHE_PREFIX=firefly +EXCHANGE_RATE_SERVICE=fixerio + GOOGLE_MAPS_API_KEY= ANALYTICS_ID= SITE_OWNER=mail@example.com @@ -48,8 +49,7 @@ USE_ENCRYPTION=true PUSHER_KEY= PUSHER_SECRET= -PUSHER_APP_ID= +PUSHER_ID= DEMO_USERNAME= DEMO_PASSWORD= - diff --git a/.env.testing b/.env.testing deleted file mode 100755 index 2cafd4c2f8..0000000000 --- a/.env.testing +++ /dev/null @@ -1,46 +0,0 @@ -APP_ENV=testing -APP_DEBUG=true -APP_FORCE_SSL=false -APP_FORCE_ROOT= -APP_KEY=TestTestTestTestTestTestTestTest -APP_LOG=daily -APP_LOG_LEVEL=debug -APP_URL=http://localhost - -DB_CONNECTION=sqlite -DB_HOST=127.0.0.1 -DB_PORT=3306 -DB_USERNAME=homestead -DB_PASSWORD=secret - -BROADCAST_DRIVER=log -CACHE_DRIVER=file -SESSION_DRIVER=file -QUEUE_DRIVER=sync - -COOKIE_PATH="/" -COOKIE_DOMAIN= -COOKIE_SECURE=false - -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_DRIVER=log -MAIL_HOST=mailtrap.io -MAIL_PORT=2525 -MAIL_FROM=changeme@example.com -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null - -SEND_REGISTRATION_MAIL=true -SEND_ERROR_MESSAGE=true -SHOW_INCOMPLETE_TRANSLATIONS=false - -ANALYTICS_ID= -SITE_OWNER=mail@example.com - -PUSHER_KEY= -PUSHER_SECRET= -PUSHER_APP_ID=