From effb2d0a7277ba2c3d3ffaccc495f6bde7254c04 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 22 Feb 2023 12:18:06 +0100
Subject: [PATCH] Update recommended default env variables

---
 docs/dev_tools/host.md    | 19 ++++++++++++++++---
 docs/docker/l3d/drupal.md | 30 +-----------------------------
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/docs/dev_tools/host.md b/docs/dev_tools/host.md
index 7333e70..28b71e6 100644
--- a/docs/dev_tools/host.md
+++ b/docs/dev_tools/host.md
@@ -12,23 +12,36 @@ tags:
 
 ```dotenv
 COMPOSER_DOWNGRADE=0
+CYPRESS=0
 DOCKER4DRUPAL_LIVE_HOST_USERNAME=YOURNAME
-DOCKER4DRUPAL_TRAEFIK_CERT=fullchain.pem
+DOCKER4DRUPAL_TRAEFIK_CERT=
+DOCKER4DRUPAL_TRAEFIK_DNS_CHALLENGE=0
+DOCKER4DRUPAL_TRAEFIK_DNS_CHALLENGE_PROVIDER=
+DOCKER4DRUPAL_TRAEFIK_DNS_CHALLENGE_RESOLVER=
 DOCKER4DRUPAL_TRAEFIK_DOMAIN=docker.localhost
-DOCKER4DRUPAL_TRAEFIK_KEY=privkey.pem
+DOCKER4DRUPAL_TRAEFIK_ENV_1=key:value
+DOCKER4DRUPAL_TRAEFIK_ENV_2=key:value
+DOCKER4DRUPAL_TRAEFIK_ENV_3=0
+DOCKER4DRUPAL_TRAEFIK_HUB_TOKEN=
+DOCKER4DRUPAL_TRAEFIK_KEY=
 DOCKER4DRUPAL_TRAEFIK_PORT=80
 DOCKER4DRUPAL_TRAEFIK_PORTAINER=1
 DOCKER4DRUPAL_TRAEFIK_PORTS=443
 DOCKER4DRUPAL_TRAEFIK_USESSL=0
+DOCKER_IMAGE_PREFIX=
 DORGFLOW=0
 DRUPAL_LIVE=0
+GITLAB_PRIVATE_TOKEN=
+GITLAB_URL=
+LOCAL_IP=1
 MAILHOG_HOST=smtp.freesmtpservers.com
 MAILHOG_MECHANISM=NONE
 MAILHOG_PASSWORD=
 MAILHOG_PORT=25
 MAILHOG_USERNAME=
+PHP_COVERAGE=0
 PHP_DEBUG=0
-PHP_VERSION=7.4
+PHP_VERSION=8.1
 WEBSERVER_CONFIG_OVERWRITE=0
 ```
 
diff --git a/docs/docker/l3d/drupal.md b/docs/docker/l3d/drupal.md
index 629c997..ad1dd45 100644
--- a/docs/docker/l3d/drupal.md
+++ b/docs/docker/l3d/drupal.md
@@ -53,35 +53,7 @@ production site.
 ## Recommended global settings for your host
 
 Before starting with Drupal projects and L3D we recommend to create or edit an `.env`
-file in your user's home directory with the following content:
-
-```shell
-COMPOSER_DOWNGRADE=0
-CYPRESS=0
-DOCKER4DRUPAL_LIVE_HOST_USERNAME=YourUserName
-DOCKER4DRUPAL_TRAEFIK_CERT=fullchain.pem
-DOCKER4DRUPAL_TRAEFIK_DOMAIN=docker.localhost
-DOCKER4DRUPAL_TRAEFIK_KEY=privkey.pem
-DOCKER4DRUPAL_TRAEFIK_PORT=8000
-DOCKER4DRUPAL_TRAEFIK_PORTAINER=0
-DOCKER4DRUPAL_TRAEFIK_PORTS=8443
-DOCKER4DRUPAL_TRAEFIK_USESSL=0
-DOCKER_IMAGE_PREFIX=gitlab.lakedrops.com/docker/dependency_proxy/containers
-DORGFLOW=0
-DRUPAL_LIVE=0
-GITLAB_PRIVATE_TOKEN=glpat-....
-GITLAB_URL=https://gitlab.lakedrops.com
-LOCAL_IP=1
-MAILHOG_HOST=smtp.freesmtpservers.com
-MAILHOG_MECHANISM=NONE
-MAILHOG_PASSWORD=
-MAILHOG_PORT=25
-MAILHOG_USERNAME=
-PHP_COVERAGE=0
-PHP_DEBUG=0
-PHP_VERSION=8.1
-WEBSERVER_CONFIG_OVERWRITE=0
-```
+file in your user's home directory. For details see [~/.env](/dev_tools/host/#env)
 
 Those will be used as default values for all your projects, and you may adjust
 them towards your own needs. With those defaults in place, you will then get less
-- 
GitLab