From 2ea76b80e9b8056d840f9a0a8c61824136a2084b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 31 Jul 2018 11:43:21 +0100
Subject: [PATCH] Use hostname for email
---
src/freedombone-utils-webadmin | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index b7153e5e4..87aef69ff 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -104,7 +104,7 @@ function web_admin_create_users {
USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
userfile="$webadmin_install_dir/userprofile_${USERNAME}.html"
- useremail=${USERNAME}@${DEFAULT_DOMAIN_NAME}
+ useremail=${USERNAME}@${HOSTNAME}
GPG_ID=$(su -c "gpg --list-keys '$useremail'" - "$USERNAME" | sed -n '2p' | sed 's/^[ \t]*//')
if [ -f "/home/$USERNAME/.gnupg/gpg.conf" ]; then
if grep -q "default-key" "/home/$USERNAME/.gnupg/gpg.conf"; then
--
GitLab