From: Dan Brown <redacted>
Date: Sat, 22 Dec 2018 18:18:14 +0000 (+0000)
Subject: Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into... 
X-Git-Tag: v0.25.0~1^2~10^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d673bf61c221ca1aa1b72d636ee354e8ac933fd2?hp=-c

Merge branch 'custom-avatar-provider' of git://github.com/Vinrobot/BookStack into Vinrobot-custom-avatar-provider
---

d673bf61c221ca1aa1b72d636ee354e8ac933fd2
diff --combined .env.example
index 11dafa2ab,06394f54f..c839d254b
--- a/.env.example
+++ b/.env.example
@@@ -48,7 -48,6 +48,7 @@@ GITHUB_APP_ID=fals
  GITHUB_APP_SECRET=false
  GOOGLE_APP_ID=false
  GOOGLE_APP_SECRET=false
 +GOOGLE_SELECT_ACCOUNT=false
  OKTA_BASE_URL=false
  OKTA_APP_ID=false
  OKTA_APP_SECRET=false
@@@ -62,6 -61,11 +62,11 @@@ DISCORD_APP_SECRET=fals
  
  # External services such as Gravatar and Draw.IO
  DISABLE_EXTERNAL_SERVICES=false
+ # Default GRAVATAR_URL set to Gravatar service
+ GRAVATAR_URL=false
+ # To use a different service to get user's avatar like libravatar
+ # Possible placeholders: %{hash} %{size} %{email}
+ #GRAVATAR_URL=https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon
  
  # LDAP Settings
  LDAP_SERVER=false
@@@ -77,8 -81,6 +82,8 @@@ LDAP_GROUP_ATTRIBUTE="memberOf
  # Would you like to remove users from roles on BookStack if they do not match on LDAP
  # If false, the ldap groups-roles sync will only add users to roles
  LDAP_REMOVE_FROM_GROUPS=false
 +# Set this option to disable LDAPS Certificate Verification
 +LDAP_TLS_INSECURE=false
  
  # Mail settings
  MAIL_DRIVER=smtp
diff --combined config/services.php
index ba1648891,b8f152124..310ea295f
--- a/config/services.php
+++ b/config/services.php
@@@ -19,6 -19,7 +19,7 @@@ return 
      'gravatar' => env('GRAVATAR', !env('DISABLE_EXTERNAL_SERVICES', false)),
      'drawio' => env('DRAWIO', !env('DISABLE_EXTERNAL_SERVICES', false)),
  
+     'gravatar_url' => env('GRAVATAR_URL', false),
  
      'callback_url' => env('APP_URL', false),
  
@@@ -59,7 -60,6 +60,7 @@@
          'name'          => 'Google',
          'auto_register' => env('GOOGLE_AUTO_REGISTER', false),
          'auto_confirm' => env('GOOGLE_AUTO_CONFIRM_EMAIL', false),
 +        'select_account' => env('GOOGLE_SELECT_ACCOUNT', false),
      ],
  
      'slack'   => [
@@@ -149,7 -149,6 +150,7 @@@
  		'user_to_groups' => env('LDAP_USER_TO_GROUPS',false),
  		'group_attribute' => env('LDAP_GROUP_ATTRIBUTE', 'memberOf'),
  		'remove_from_groups' => env('LDAP_REMOVE_FROM_GROUPS',false),
 +		'tls_insecure' => env('LDAP_TLS_INSECURE', false),
  	]
  
  ];