Move sysvol and netlogon to smb.conf (only user editable should remain in conf.d).

Use lowercase REALM for netlogon share path.

entrypoint.sh

@@ -6,6 +6,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'
@@ -43,16 +44,14 @@ if [ ! -f /var/lib/samba/registry.tdb ]; then
   echo 'root = administrator' > /etc/samba/smbusers
 fi
 mkdir -p -m 700 /etc/samba/conf.d
-for file in /etc/samba/smb.conf /etc/samba/conf.d/netlogon.conf \
+for file in /etc/samba/smb.conf; do
-      /etc/samba/conf.d/sysvol.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:" \
       -e "s:{{ REALM }}:$REALM:" \
+      -e "s:{{ DOMAIN }}:$DOMAIN:" \
       -e "s:{{ SERVER_STRING }}:$SERVER_STRING:" \
       -e "s:{{ WINBIND_USE_DEFAULT_DOMAIN }}:$WINBIND_USE_DEFAULT_DOMAIN:" \
       -e "s:{{ WORKGROUP }}:$WORKGROUP:" \

netlogon.conf.j2

@@ -1,3 +0,0 @@
-[netlogon]
-	path = /var/lib/samba/sysvol/{{ REALM }}/scripts
-	read only = No

smb.conf.j2

@@ -18,4 +18,12 @@
 	acl_xattr:ignore system acls = yes
 	acl_xattr:default acl style = windows
 
+[sysvol]
+	path = /var/lib/samba/sysvol
+	read only = No
+
+[netlogon]
+	path = /var/lib/samba/sysvol/{{ DOMAIN }}/scripts
+	read only = No
+
 # Empty new-line must follow

sysvol.conf.j2

@@ -1,3 +0,0 @@
-[sysvol]
-	path = /var/lib/samba/sysvol
-	read only = No