From 60f2c19d9d395057641cffb80c62159aee7568fc Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 21 Oct 2018 11:07:19 +0200
Subject: [PATCH] Clean up env files.

---
 .env.docker    | 3 ---
 .env.example   | 8 +++-----
 .env.heroku    | 8 +++-----
 .env.sandstorm | 8 +++-----
 .env.testing   | 8 +++-----
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.env.docker b/.env.docker
index 0e98690fc7..f31a88af50 100644
--- a/.env.docker
+++ b/.env.docker
@@ -136,7 +136,6 @@ ADLDAP_ADMIN_ACCOUNT_SUFFIX="${ADLDAP_ADMIN_ACCOUNT_SUFFIX}"
 ADLDAP_PASSWORD_SYNC=${ADLDAP_PASSWORD_SYNC}
 ADLDAP_LOGIN_FALLBACK=${ADLDAP_LOGIN_FALLBACK}
 
-ADLDAP_SYNC_FIELD=${ADLDAP_SYNC_FIELD}
 ADLDAP_DISCOVER_FIELD=${ADLDAP_DISCOVER_FIELD}
 ADLDAP_AUTH_FIELD=${ADLDAP_AUTH_FIELD}
 
@@ -167,5 +166,3 @@ IS_DOCKER=true
 IS_SANDSTORM=false
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
diff --git a/.env.example b/.env.example
index a5a2d85f48..9f016e8b25 100644
--- a/.env.example
+++ b/.env.example
@@ -112,7 +112,8 @@ USE_ENCRYPTION=true
 LOGIN_PROVIDER=eloquent
 
 # LDAP connection configuration
-ADLDAP_CONNECTION_SCHEME=OpenLDAP # or FreeIPA or ActiveDirectory
+# OpenLDAP, FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
@@ -136,7 +137,6 @@ ADLDAP_ADMIN_ACCOUNT_SUFFIX=
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
 
-ADLDAP_SYNC_FIELD=userprincipalname
 ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
@@ -145,7 +145,7 @@ WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
-ADLDAP_SYNC_FIELD=uid
+ADLDAP_SYNC_FIELD=userprincipalname
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
@@ -167,5 +167,3 @@ IS_DOCKER=false
 IS_SANDSTORM=false
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
diff --git a/.env.heroku b/.env.heroku
index 426a8900ca..30106f2072 100644
--- a/.env.heroku
+++ b/.env.heroku
@@ -112,7 +112,8 @@ USE_ENCRYPTION=true
 LOGIN_PROVIDER=eloquent
 
 # LDAP connection configuration
-ADLDAP_CONNECTION_SCHEME=OpenLDAP # or FreeIPA or ActiveDirectory
+# OpenLDAP, FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
@@ -136,7 +137,6 @@ ADLDAP_ADMIN_ACCOUNT_SUFFIX=
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
 
-ADLDAP_SYNC_FIELD=userprincipalname
 ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
@@ -145,7 +145,7 @@ WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
-ADLDAP_SYNC_FIELD=uid
+ADLDAP_SYNC_FIELD=userprincipalname
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
@@ -167,5 +167,3 @@ IS_DOCKER=false
 IS_SANDSTORM=false
 IS_HEROKU=true
 BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
diff --git a/.env.sandstorm b/.env.sandstorm
index 83062e9530..9c1100bc59 100755
--- a/.env.sandstorm
+++ b/.env.sandstorm
@@ -112,7 +112,8 @@ USE_ENCRYPTION=true
 LOGIN_PROVIDER=eloquent
 
 # LDAP connection configuration
-ADLDAP_CONNECTION_SCHEME=OpenLDAP # or FreeIPA or ActiveDirectory
+ # or FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
@@ -136,7 +137,6 @@ ADLDAP_ADMIN_ACCOUNT_SUFFIX=
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
 
-ADLDAP_SYNC_FIELD=userprincipalname
 ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
@@ -145,7 +145,7 @@ WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
-ADLDAP_SYNC_FIELD=uid
+ADLDAP_SYNC_FIELD=userprincipalname
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
@@ -167,5 +167,3 @@ IS_DOCKER=false
 IS_SANDSTORM=true
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=false
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=
diff --git a/.env.testing b/.env.testing
index 312d28a9ec..abab43b463 100644
--- a/.env.testing
+++ b/.env.testing
@@ -112,7 +112,8 @@ USE_ENCRYPTION=false
 LOGIN_PROVIDER=eloquent
 
 # LDAP connection configuration
-ADLDAP_CONNECTION_SCHEME=OpenLDAP # or FreeIPA or ActiveDirectory
+ # or FreeIPA or ActiveDirectory
+ADLDAP_CONNECTION_SCHEME=OpenLDAP
 ADLDAP_AUTO_CONNECT=true
 
 # LDAP connection settings
@@ -136,7 +137,6 @@ ADLDAP_ADMIN_ACCOUNT_SUFFIX=
 ADLDAP_PASSWORD_SYNC=false
 ADLDAP_LOGIN_FALLBACK=false
 
-ADLDAP_SYNC_FIELD=userprincipalname
 ADLDAP_DISCOVER_FIELD=distinguishedname
 ADLDAP_AUTH_FIELD=distinguishedname
 
@@ -145,7 +145,7 @@ WINDOWS_SSO_DISCOVER=samaccountname
 WINDOWS_SSO_KEY=AUTH_USER
 
 # field to sync as local username.
-ADLDAP_SYNC_FIELD=uid
+ADLDAP_SYNC_FIELD=userprincipalname
 
 # Leave the following configuration vars as is.
 # Unless you like to tinker and know what you're doing.
@@ -167,5 +167,3 @@ IS_DOCKER=false
 IS_SANDSTORM=false
 IS_HEROKU=false
 BUNQ_USE_SANDBOX=true
-MAILGUN_DOMAIN=
-MAILGUN_SECRET=