From 6c57adafeb94ced1395dcde4a7196b45225b920a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Van=C3=AD=C4=8Dek?= Date: Fri, 27 Jan 2023 11:38:56 +0100 Subject: [PATCH] Do not require lower-case DOMAIN variable - calculate it. --- Dockerfile | 1 - entrypoint.sh | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e6f1817..87ee113 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \ MODEL=standard \ NETBIOS_NAME= \ REALM=ad.example.com \ - DOMAIN=ed.example.com \ SERVER_STRING="Samba Member Server" \ TZ=UTC \ WINBIND_USE_DEFAULT_DOMAIN=yes \ diff --git a/entrypoint.sh b/entrypoint.sh index 787f901..78f0897 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,6 +8,7 @@ else NETBIOS_NAME=$(echo $NETBIOS_NAME | tr [a-z] [A-Z]) fi REALM=$(echo "$REALM" | tr [a-z] [A-Z]) +DOMAIN=$(echo "$REALM" | tr [A-Z] [a-z]) if [ ! -f /etc/timezone ] && [ ! -z "$TZ" ]; then echo 'Set timezone' @@ -42,8 +43,6 @@ mkdir -p -m 700 /etc/samba/conf.d for file in /etc/samba/smb.conf; do sed -e "s:{{ ALLOW_DNS_UPDATES }}:$ALLOW_DNS_UPDATES:" \ -e "s:{{ BIND_INTERFACES_ONLY }}:$BIND_INTERFACES_ONLY:" \ - -e "s:{{ DOMAIN_LOGONS }}:$DOMAIN_LOGONS:" \ - -e "s:{{ DOMAIN_MASTER }}:$DOMAIN_MASTER:" \ -e "s+{{ INTERFACES }}+$INTERFACES+" \ -e "s:{{ LOG_LEVEL }}:$LOG_LEVEL:" \ -e "s:{{ NETBIOS_NAME }}:$NETBIOS_NAME:" \