Write state dir to smb.conf

smb.conf now sets state and cache directory, then includes the registry.
This also allows us to write the final smb.conf before importing
remaining settings into the Samba registry.

Fixes: https://pagure.io/freeipa/issue/8401
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Reviewed-By: Francois Cami <fcami@redhat.com>

install/share/Makefile.am

@@ -58,6 +58,7 @@ dist_app_DATA =				\
 	krb.con.template		\
 	krbrealm.con.template		\
 	smb.conf.template		\
+	smb.conf.registry.template		\
 	smb.conf.empty			\
 	referint-conf.ldif		\
 	dna.ldif			\

install/share/smb.conf.registry.template

@@ -0,0 +1,35 @@
+[global]
+workgroup = $NETBIOS_NAME
+netbios name = $HOST_NETBIOS_NAME
+realm = $REALM
+kerberos method = dedicated keytab
+dedicated keytab file = /etc/samba/samba.keytab
+create krb5 conf = no
+security = user
+domain master = yes
+domain logons = yes
+log level = 1
+max log size = 100000
+log file = /var/log/samba/log.%m
+passdb backend = ipasam:ldapi://$LDAPI_SOCKET
+disable spoolss = yes
+ldapsam:trusted=yes
+ldap ssl = off
+ldap suffix = $SUFFIX
+ldap user suffix = cn=users,cn=accounts
+ldap group suffix = cn=groups,cn=accounts
+ldap machine suffix = cn=computers,cn=accounts
+rpc_server:epmapper = external
+rpc_server:lsarpc = external
+rpc_server:lsass = external
+rpc_server:lsasd = external
+rpc_server:samr = external
+rpc_server:netlogon = external
+rpc_server:tcpip = yes
+rpc_daemon:epmd = fork
+rpc_daemon:lsasd = fork
+idmap config * : backend = tdb
+idmap config * : range =  0 - 0
+idmap config $NETBIOS_NAME : backend = sss
+idmap config $NETBIOS_NAME : range = $IPA_LOCAL_RANGE
+max smbd processes = 1000

install/share/smb.conf.template

@@ -1,35 +1,7 @@
+### Added by IPA Installer ###
+#         DO NOT EDIT        #
 [global]
-workgroup = $NETBIOS_NAME
-netbios name = $HOST_NETBIOS_NAME
-realm = $REALM
-kerberos method = dedicated keytab
-dedicated keytab file = /etc/samba/samba.keytab
-create krb5 conf = no
-security = user
-domain master = yes
-domain logons = yes
-log level = 1
-max log size = 100000
-log file = /var/log/samba/log.%m
-passdb backend = ipasam:ldapi://$LDAPI_SOCKET
-disable spoolss = yes
-ldapsam:trusted=yes
-ldap ssl = off
-ldap suffix = $SUFFIX
-ldap user suffix = cn=users,cn=accounts
-ldap group suffix = cn=groups,cn=accounts
-ldap machine suffix = cn=computers,cn=accounts
-rpc_server:epmapper = external
-rpc_server:lsarpc = external
-rpc_server:lsass = external
-rpc_server:lsasd = external
-rpc_server:samr = external
-rpc_server:netlogon = external
-rpc_server:tcpip = yes
-rpc_daemon:epmd = fork
-rpc_daemon:lsasd = fork
-idmap config * : backend = tdb
-idmap config * : range =  0 - 0
-idmap config $NETBIOS_NAME : backend = sss
-idmap config $NETBIOS_NAME : range = $IPA_LOCAL_RANGE
-max smbd processes = 1000
+debug pid = yes
+state directory = $SAMBA_DIR
+cache directory = $SAMBA_DIR
+include = registry