update default env

.env.sample

@@ -3,10 +3,13 @@ TYPE=bonfire
 # choose what flavour of Bonfire to run
 FLAVOUR=classic
 
+# choose what extra services you want to run
+#COMPOSE_FILE="compose.yml:compose.meilisearch.yml"
+
 # Different flavours/forks or architectures may require different builds of bonfire:
 # for ARM (manual build):
 APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}-aarch64
-for x86 (built by CI):
+# for x86 (built by CI):
 APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}-amd64
 # multi-arch image (built by CI, but currently not working): 
 #APP_DOCKER_IMAGE=bonfirenetworks/bonfire:latest-${FLAVOUR}
@@ -23,7 +26,7 @@ DOMAIN=bonfire.example.com
 #EXTRA_DOMAINS=', `www.bonfire.example.com`'
 
 # what service to use for sending out emails (eg. smtp, mailgun, none) NOTE: you should also set the corresponding keys in secrets.env
-MAIL_BACKEND=mailgun
+MAIL_BACKEND=none
 
 # require an email address to be invited before being able to sign up? (true or false)
 INVITE_ONLY=true
@@ -47,15 +50,15 @@ LOG_LEVEL=info
 # change ALL the values:
 
 # if `INVITE_ONLY` is true, what should be the secret code to sign up?
-INVITE_KEY=123
+# INVITE_KEY=123
 
 # signup to mailgun.com and edit with your domain and API key
-MAIL_DOMAIN=mgo.example.com
+# MAIL_DOMAIN=mgo.example.com
-MAIL_KEY=xyz
+# MAIL_KEY=xyz
-MAIL_FROM=admin@example.com
+# MAIL_FROM=admin@example.com
 
 # error reporting
-SENTRY_DSN=
+# SENTRY_DSN=
 
 # Store uploads in S3-compatible service
 # UPLOADS_S3_BUCKET=
@@ -67,11 +70,11 @@ SENTRY_DSN=
 # UPLOADS_S3_URL=
 
 # Bonfire extensions configs:
-WEB_PUSH_SUBJECT=mailto:admin@example.com
+# WEB_PUSH_SUBJECT=mailto:admin@example.com
-WEB_PUSH_PUBLIC_KEY=xyz
+# WEB_PUSH_PUBLIC_KEY=xyz
-WEB_PUSH_PRIVATE_KEY=abc
+# WEB_PUSH_PRIVATE_KEY=abc
-GEOLOCATE_OPENCAGEDATA=
+# GEOLOCATE_OPENCAGEDATA=
-GITHUB_TOKEN=xyz
+# GITHUB_TOKEN=xyz
 
 # ====================================
 # these secrets will be autogenerated/managed by abra and docker"

compose.meilisearch.yml

@@ -0,0 +1,27 @@
+---
+version: "3.8"
+
+services:
+  app:
+    depends_on:
+      - search
+    environment:
+      - SEARCH_MEILI_INSTANCE=http://${STACK_NAME}_search:7700
+      
+  search:
+    image: getmeili/meilisearch:latest
+    secrets:
+      - meili_master_key
+    volumes:
+      - "search-data:/data.ms"
+    networks:
+      - internal
+    entrypoint: ["tini", "--", "/docker-entrypoint.sh", "/bin/meilisearch"]
+    configs:
+      - source: app_entrypoint
+        target: /docker-entrypoint.sh
+        mode: 0555
+
+volumes:
+  search-data:
+

compose.yml

@@ -11,10 +11,8 @@ services:
         max-file: "10"
     depends_on:
       - db
-      - search
     environment:
       - POSTGRES_HOST=${STACK_NAME}_db
-      - SEARCH_MEILI_INSTANCE=http://${STACK_NAME}_search:7700
       - POSTGRES_USER=postgres
       - POSTGRES_DB=bonfire_db
       - PUBLIC_PORT=443
@@ -34,6 +32,9 @@ services:
       - APP_NAME
       - PLUG_SERVER
       
+      - DB_SLOW_QUERY_MS
+      - DB_STATEMENT_TIMEOUT
+      
       - MAIL_BACKEND
       - MAIL_DOMAIN
       - MAIL_FROM
@@ -48,6 +49,10 @@ services:
       - MAIL_PASSWORD
 
       - SENTRY_DSN
+      - OTEL_ENABLED
+      - OTEL_SERVICE_NAME
+      - OTEL_HONEYCOMB_API_KEY
+      - OTEL_LIGHTSTEP_API_KEY
       
       - WEB_PUSH_SUBJECT
       - WEB_PUSH_PUBLIC_KEY
@@ -128,23 +133,9 @@ services:
     #   - /tmp:size=${DB_MEMORY_LIMIT}
     #entrypoint: ['tail', '-f', '/dev/null'] # uncomment when the Postgres DB is corrupted and won't start
 
-  search:
-    image: getmeili/meilisearch:latest
-    secrets:
-      - meili_master_key
-    volumes:
-      - "search-data:/data.ms"
-    networks:
-      - internal
-    entrypoint: ["tini", "--", "/docker-entrypoint.sh", "/bin/meilisearch"]
-    configs:
-      - source: app_entrypoint
-        target: /docker-entrypoint.sh
-        mode: 0555
 
 volumes:
   db-data:
-  search-data:
   upload-data:
 
 networks: