From: Alexander <devkral@web.de>
Date: Mon, 19 Mar 2018 19:09:26 +0000 (+0100)
Subject: rename pam email environment variable to something more understandable and default... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=33ee347c995515946e0a045394fe693875ee1cdf;p=mastodon.git

rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)
---

diff --git a/.env.production.sample b/.env.production.sample
index 579ad667b..1e5ed9f3d 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -155,8 +155,8 @@ STREAMING_CLUSTER_NUM=1
 # The pam environment variable "email" is provided by:
 # https://github.com/devkral/pam_email_extractor
 # PAM_ENABLED=true
-# Fallback Suffix for email address generation (nil by default)
-# PAM_DEFAULT_SUFFIX=pam
+# Fallback email domain for email address generation (LOCAL_DOMAIN by default)
+# PAM_EMAIL_DOMAIN=example.com
 # Name of the pam service (pam "auth" section is evaluated)
 # PAM_DEFAULT_SERVICE=rpam
 # Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default)
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index df45dcd1f..97757d0fb 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -342,7 +342,7 @@ Devise.setup do |config|
     config.usernamefield          = nil
     config.emailfield             = 'email'
     config.check_at_sign          = true
-    config.pam_default_suffix     = ENV.fetch('PAM_DEFAULT_SUFFIX') { nil }
+    config.pam_default_suffix     = ENV.fetch('PAM_EMAIL_DOMAIN') { ENV['LOCAL_DOMAIN'] }
     config.pam_default_service    = ENV.fetch('PAM_DEFAULT_SERVICE') { 'rpam' }
     config.pam_controlled_service = ENV.fetch('PAM_CONTROLLED_SERVICE') { nil }
   end