Cleanup env

Author: karlomikus

.env.dist

@@ -26,8 +26,6 @@ REDIS_PORT=6379
 SCOUT_DRIVER=meilisearch
 MEILISEARCH_HOST=
 MEILISEARCH_KEY=
-MEILISEARCH_API_KEY=
-MEILISEARCH_API_KEY_UID=
 
 # Mail
 # MAIL_MAILER=
@@ -50,4 +48,4 @@ MAIL_REQUIRE_CONFIRMATION=false
 # PADDLE_SANDBOX=
 # PADDLE_VENDOR_ID=
 # PADDLE_VENDOR_AUTH_CODE=
-# PADDLE_AUTH_CODE=
+# PADDLE_AUTH_CODE=

.env.testing

@@ -11,8 +11,6 @@ DB_DATABASE=":memory:"
 SCOUT_DRIVER=meilisearch
 MEILISEARCH_HOST=http://meilisearch:7700
 MEILISEARCH_KEY=masterKeyThatIsReallyReallyLong4Real
-MEILISEARCH_API_KEY=
-MEILISEARCH_API_KEY_UID=
 
 SPEC_PATH=./docs
 

CHANGELOG.md

@@ -7,6 +7,12 @@
     - You can now set a client certificate for scraping requests
     - Example value: `/var/www/cocktails/storage/bar-assistant/my-cert.pem`
 
+## Changes
+- Improved search results for queries with multiple words
+
+## Fixes
+- Fixed out of memory errors when exporting large bars
+
 # v5.10.0
 ## New
 - Added `locked_user_cocktails` filter to cocktails endpoint

README.md

@@ -63,9 +63,35 @@ Bar Assistant is available as a Docker image on [Docker Hub](https://hub.docker.
 - `barassistant/server:v4.4.1` - This will pull the exact version
 - `barassistant/server:v4.4` - This will pull the latest minor release
 - `barassistant/server:v4` - This will pull the latest major release
+- `barassistant/server:dev` - This will pull the latest development version (not recommended for production)
 
 We recommend that you always use the latest major release, as it will always be the most stable version.
 
+## Environment Variables
+
+Here's a list of interesting environment variables you can set to configure Bar Assistant:
+
+|Name|Default|Description|
+|----|-------|-----------|
+|REDIS_HOST|redis|The Redis host.|
+|CACHE_DRIVER|redis|The cache driver to use (`file` or `redis`).|
+|SESSION_DRIVER|redis|The session driver to use (`file` or `redis`).|
+|ALLOW_REGISTRATION|true|Allow or disallow user registration.|
+|MAIL_REQUIRE_CONFIRMATION|false|Require email confirmation for new user registrations.|
+|MEILISEARCH_HOST||The Meilisearch host URL.|
+|MEILISEARCH_KEY||The Meilisearch API key.|
+|METRICS_ENABLED|false|Enable or disable Prometheus metrics endpoint.|
+|METRICS_ALLOWED_IPS||Comma-separated list of IPs allowed to access metrics endpoint.|
+|ENABLE_PASSWORD_LOGIN|true|Enable or disable password login.|
+|SCRAPING_HTTP_PROXY||HTTP proxy URL for web scraping.|
+|SCRAPING_CLIENT_CERT||Path to client certificate for web scraping.|
+|MAIL_MAILER||The mailer to use.|
+|MAIL_HOST||The mail host.|
+|MAIL_PORT||The mail port.|
+|MAIL_ENCRYPTION||The mail encryption method.|
+|MAIL_USERNAME||The mail username.|
+|MAIL_PASSWORD||The mail password.|
+
 ## Managed instance
 
 Bar Assistant will always be open-source and MIT-licensed, but if you want to support the project or don't want to self-host, you can try our official managed instance. Visit [barassistant.app](https://barassistant.app/) for more information about our cloud offering.

composer.lock

@@ -132,8 +132,6 @@
     'meilisearch' => [
         'host' => env('MEILISEARCH_HOST', 'http://localhost:7700'),
         'key' => env('MEILISEARCH_KEY', null),
-        // 'api_key' => env('MEILISEARCH_API_KEY', null),
-        // 'api_key_uid' => env('MEILISEARCH_API_KEY_UID', null),
         'index-settings' => [
             \Kami\Cocktail\Models\Cocktail::class => [
                 'filterableAttributes' => ['tags', 'bar_id'],