diff options
Diffstat (limited to 'docs/Samba3-ByExample')
| -rw-r--r-- | docs/Samba3-ByExample/SBE-2000UserNetwork.xml | 30 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-500UserNetwork.xml | 36 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-AddingUNIXClients.xml | 42 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-DomainAppsSupport.xml | 6 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-MakingHappyUsers.xml | 36 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml | 12 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml | 30 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-SecureOfficeServer.xml | 18 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml | 24 | ||||
| -rw-r--r-- | docs/Samba3-ByExample/SBE-TheSmallOffice.xml | 12 |
10 files changed, 164 insertions, 82 deletions
diff --git a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml index f55fc34f28..feab045ddd 100644 --- a/docs/Samba3-ByExample/SBE-2000UserNetwork.xml +++ b/docs/Samba3-ByExample/SBE-2000UserNetwork.xml @@ -1049,8 +1049,9 @@ index default sub </screen> </example> -<smbconfexample id="ch7-massmbconfA"> +<example id="ch7-massmbconfA"> <title>Primary Domain Controller &smb.conf; File &smbmdash; Part A</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -1096,10 +1097,12 @@ index default sub <smbconfoption name="idmap gid">10000-20000</smbconfoption> <smbconfoption name="printer admin">root</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch7-massmbconfB"> +<example id="ch7-massmbconfB"> <title>Primary Domain Controller &smb.conf; File &smbmdash; Part B</title> +<smbconfblock> <smbconfsection name="[IPC$]"/> <smbconfoption name="path">/tmp</smbconfoption> @@ -1130,10 +1133,12 @@ index default sub <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch7-massmbconfC"> +<example id="ch7-massmbconfC"> <title>Primary Domain Controller &smb.conf; File &smbmdash; Part C</title> +<smbconfblock> <smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> @@ -1164,10 +1169,12 @@ index default sub <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="write list">root</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch7-slvsmbocnfA"> +<example id="ch7-slvsmbocnfA"> <title>Backup Domain Controller &smb.conf; File &smbmdash; Part A</title> +<smbconfblock> <smbconfcomment># Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -1211,10 +1218,12 @@ index default sub <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch7-slvsmbocnfB"> +<example id="ch7-slvsmbocnfB"> <title>Backup Domain Controller &smb.conf; File &smbmdash; Part B</title> +<smbconfblock> <smbconfsection name="[pidata]"/> <smbconfoption name="comment">Property Insurance Files</smbconfoption> <smbconfoption name="path">/data/pidata</smbconfoption> @@ -1256,7 +1265,8 @@ index default sub <smbconfoption name="path">/var/lib/samba/profdata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <sect2> <title>Key Points Learned</title> diff --git a/docs/Samba3-ByExample/SBE-500UserNetwork.xml b/docs/Samba3-ByExample/SBE-500UserNetwork.xml index 1f4e9f7093..b94c8d69e4 100644 --- a/docs/Samba3-ByExample/SBE-500UserNetwork.xml +++ b/docs/Samba3-ByExample/SBE-500UserNetwork.xml @@ -948,8 +948,9 @@ hosts: files dns wins </sect2> <!-- One --> -<smbconfexample id="ch5-massivesmb"> +<example id="ch5-massivesmb"> <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename></title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET</smbconfoption> @@ -987,11 +988,13 @@ hosts: files dns wins <smbconfoption name="comment">Property Insurance Files</smbconfoption> <smbconfoption name="path">/data/pidata</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <!-- Two --> -<smbconfexample id="ch5-dc-common"> +<example id="ch5-dc-common"> <title>Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename></title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption> @@ -1021,11 +1024,13 @@ hosts: files dns wins <smbconfoption name="path">/var/lib/samba/profiles</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="profile acls">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <!-- Three --> -<smbconfexample id="ch5-commonsmb"> +<example id="ch5-commonsmb"> <title>Common Samba Configuration File: <filename>/etc/samba/common.conf</filename></title> +<smbconfblock <smbconfsection name="[global]"/> <smbconfoption name="username map">/etc/samba/smbusers</smbconfoption> <smbconfoption name="log level">1</smbconfoption> @@ -1061,31 +1066,37 @@ hosts: files dns wins <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="admin users">bjordan</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <!-- Four --> -<smbconfexample id="ch5-bldg1-smb"> +<example id="ch5-bldg1-smb"> <title>Server: BLDG1 (Member), File: smb.conf</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET</smbconfoption> <smbconfoption name="netbios name">BLDG1</smbconfoption> <smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <!-- Five --> -<smbconfexample id="ch5-bldg2-smb"> +<example id="ch5-bldg2-smb"> <title>Server: BLDG2 (Member), File: smb.conf</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET</smbconfoption> <smbconfoption name="netbios name">BLDG2</smbconfoption> <smbconfoption name="include">/etc/samba/dom-mem.conf</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <!-- Six --> -<smbconfexample id="ch5-dommem-smb"> +<example id="ch5-dommem-smb"> <title>Common Domain Member Include File: dom-mem.conf</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="shutdown script">/var/lib/samba/scripts/shutdown.sh</smbconfoption> @@ -1095,7 +1106,8 @@ hosts: files dns wins <smbconfoption name="idmap uid">15000-20000</smbconfoption> <smbconfoption name="idmap gid">15000-20000</smbconfoption> <smbconfoption name="include">/etc/samba/common.conf</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <!-- Seven --> <example id="massive-dhcp"> diff --git a/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml index 57487916b2..78c76c91eb 100644 --- a/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml +++ b/docs/Samba3-ByExample/SBE-AddingUNIXClients.xml @@ -680,8 +680,9 @@ Join to 'MEGANET2' failed. </procedure> -<smbconfexample id="ch9-sdmsdc"> +<example id="ch9-sdmsdc"> <title>Samba Domain Member in Samba Domain Using LDAP &smbmdash; &smb.conf; File</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -727,7 +728,8 @@ Join to 'MEGANET2' failed. <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> <smbconfoption name="write list">root</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <example id="ch9-ldifadd"> <title>LDIF IDMAP Add-On Load File &smbmdash; File: /etc/openldap/idmap.LDIF</title> @@ -979,8 +981,9 @@ MEGANET2+PIOps:x:10005: </para></step> </procedure> -<smbconfexample id="ch0-NT4DSDM"> +<example id="ch0-NT4DSDM"> <title>Samba Domain Member Server Using Winbind &smb.conf; File for NT4 Domain</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -1022,7 +1025,8 @@ MEGANET2+PIOps:x:10005: <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> <smbconfoption name="write list">root</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> </sect2> @@ -1071,8 +1075,9 @@ Joined domain MEGANET2. </para></step> </procedure> -<smbconfexample id="ch0-NT4DSCM"> +<example id="ch0-NT4DSCM"> <title>Samba Domain Member Server Using Local Accounts &smb.conf; File for NT4 Domain</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -1114,7 +1119,8 @@ Joined domain MEGANET2. <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> <smbconfoption name="write list">root</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> </sect2> <sect2 id="adssdm"> @@ -1672,8 +1678,9 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- May this server serve well all who happen upon it. </para> -<smbconfexample id="ch9-adssdm"> +<example id="ch9-adssdm"> <title>Samba Domain Member &smb.conf; File for Active Directory Membership</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -1713,7 +1720,8 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> <smbconfoption name="admin users">root, Administrator</smbconfoption> <smbconfoption name="write list">root</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <sect3> <title>IDMAP_RID with Winbind</title> @@ -1755,8 +1763,9 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- An example &smb.conf; file for an ADS domain environment is shown in <link linkend="sbe-idmapridex"/>. </para> -<smbconfexample id="sbe-idmapridex"> +<example id="sbe-idmapridex"> <title>Example &smb.conf; File Using <constant>idmap_rid</constant></title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">KPAK</smbconfoption> @@ -1774,7 +1783,8 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- <smbconfoption name="winbind enum groups">No</smbconfoption> <smbconfoption name="winbind nested groups">Yes</smbconfoption> <smbconfoption name="printer admin">"KPAK\Domain Admins"</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <para> <indexterm><primary>large domain</primary></indexterm> @@ -1876,8 +1886,9 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash The example in <link linkend="sbeunxa"/> is for an ADS-style domain. </para> -<smbconfexample id="sbeunxa"> +<example id="sbeunxa"> <title>Typical ADS Style Domain &smb.conf; File</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">SNOWSHOW</smbconfoption> @@ -1894,7 +1905,8 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash <smbconfoption name="idmap gid">150000-550000</smbconfoption> <smbconfoption name="template shell">/bin/bash</smbconfoption> <smbconfoption name="winbind use default domain">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <para> <indexterm><primary>realm</primary></indexterm> @@ -2078,8 +2090,9 @@ Joined 'GOODELF' to realm 'SNOWSHOW.COM' An example &smb.conf; file is shown in <link linkend="sbewinbindex"/>. </para> -<smbconfexample id="sbewinbindex"> +<example id="sbewinbindex"> <title>ADS Membership Using RFC2307bis Identity Resolution &smb.conf; File</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">BUBBAH</smbconfoption> @@ -2093,7 +2106,8 @@ Joined 'GOODELF' to realm 'SNOWSHOW.COM' <smbconfoption name="winbind use default domain">Yes</smbconfoption> <smbconfoption name="winbind trusted domains only">Yes</smbconfoption> <smbconfoption name="winbind nested groups">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <para> <indexterm><primary>nss_ldap</primary></indexterm> diff --git a/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml b/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml index 49dafda9fa..4ca9a097a8 100644 --- a/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml +++ b/docs/Samba3-ByExample/SBE-DomainAppsSupport.xml @@ -581,8 +581,9 @@ password: XXXXXXXX in <link linkend="ch10-etcnsscfg"/>. </para> -<smbconfexample id="ch10-smbconf"> +<example id="ch10-smbconf"> <title>Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename></title> +<smbconfblock> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">LONDON</smbconfoption> <smbconfoption name="netbios name">W2K3S</smbconfoption> @@ -603,7 +604,8 @@ password: XXXXXXXX <smbconfoption name="winbind enum users">yes</smbconfoption> <smbconfoption name="winbind enum groups">yes</smbconfoption> <smbconfoption name="winbind user default domain">yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <example id="ch10-etcnsscfg"> <title>NSS Configuration File Extract &smbmdash; File: <filename>/etc/nsswitch.conf</filename></title> diff --git a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml index 024cfd6643..a20a8f1633 100644 --- a/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml +++ b/docs/Samba3-ByExample/SBE-MakingHappyUsers.xml @@ -1852,8 +1852,9 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 configuration of the LDAP server. </para> -<smbconfexample id="sbehap-massive-smbconfa"> +<example id="sbehap-massive-smbconfa"> <title>LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -1884,10 +1885,12 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 <smbconfoption name="set primary group script">/opt/IDEALX/sbin/</smbconfoption> <member><parameter>smbldap-usermod -g "%g" "%u"</parameter></member> <smbconfoption name="add machine script">/opt/IDEALX/sbin/smbldap-useradd -w "%u"</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="sbehap-massive-smbconfb"> +<example id="sbehap-massive-smbconfb"> <title>LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part B</title> +<smbconfblock> <smbconfoption name="logon script">scripts\logon.bat</smbconfoption> <smbconfoption name="logon path">\\%L\profiles\%U</smbconfoption> <smbconfoption name="logon drive">X:</smbconfoption> @@ -1906,7 +1909,8 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 <smbconfoption name="map acl inherit">Yes</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printer admin">root, chrisr</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> </sect2> @@ -3185,8 +3189,9 @@ smb: \> q </procedure> -<smbconfexample id="sbehap-bldg1-smbconf"> +<example id="sbehap-bldg1-smbconf"> <title>LDAP Based &smb.conf; File, Server: BLDG1</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -3220,11 +3225,13 @@ smb: \> q <smbconfoption name="idmap gid">10000-20000</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printer admin">root, chrisr</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="sbehap-bldg2-smbconf"> +<example id="sbehap-bldg2-smbconf"> <title>LDAP Based &smb.conf; File, Server: BLDG2</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="unix charset">LOCALE</smbconfoption> @@ -3258,11 +3265,13 @@ smb: \> q <smbconfoption name="idmap gid">10000-20000</smbconfoption> <smbconfoption name="printing">cups</smbconfoption> <smbconfoption name="printer admin">root, chrisr</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="sbehap-shareconfa"> +<example id="sbehap-shareconfa"> <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A</title> +<smbconfblock> <smbconfsection name="[accounts]"/> <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> @@ -3290,10 +3299,12 @@ smb: \> q <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="sbehap-shareconfb"> +<example id="sbehap-shareconfb"> <title>LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B</title> +<smbconfblock> <smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Files</smbconfoption> <smbconfoption name="path">/apps</smbconfoption> @@ -3325,7 +3336,8 @@ smb: \> q <smbconfoption name="guest ok">no</smbconfoption> <smbconfoption name="read only">yes</smbconfoption> <smbconfoption name="write list">root, chrisr</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <example id="sbehap-ldifadd"> <title>LDIF IDMAP Add-On Load File &smbmdash; File: /etc/openldap/idmap.LDIF</title> diff --git a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml index 476d55a0ec..57328217b2 100644 --- a/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml +++ b/docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml @@ -399,8 +399,9 @@ no account information can be deleted. </para></step> -<smbconfexample id="sbent4smb"> +<example id="sbent4smb"> <title>NT4 Migration Samba-3 Server <filename>smb.conf</filename> &smbmdash; Part: A</title> +<smbconfblock> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">DAMNATION</smbconfoption> <smbconfoption name="netbios name">MERLIN</smbconfoption> @@ -446,10 +447,12 @@ <smbconfoption name="winbind nested groups">Yes</smbconfoption> <smbconfoption name="ea support">Yes</smbconfoption> <smbconfoption name="map acl inherit">Yes</smbconfoption> -</smbconfexample> + </smbconfblock> +</example> -<smbconfexample id="sbent4smb2"> +<example id="sbent4smb2"> <title>NT4 Migration Samba-3 Server <filename>smb.conf</filename> &smbmdash; Part: B</title> +<smbconfblock> <smbconfsection name="[apps]"/> <smbconfoption name="comment">Application Data</smbconfoption> <smbconfoption name="path">/data/home/apps</smbconfoption> @@ -491,7 +494,8 @@ <smbconfsection name="[print$]"/> <smbconfoption name="comment">Printer Drivers</smbconfoption> <smbconfoption name="path">/var/lib/samba/drivers</smbconfoption> -</smbconfexample> + </smbconfblock> +</example> <step><para> <indexterm><primary>slapd.conf</primary></indexterm> diff --git a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml index 43dee10a32..f823cc67bb 100644 --- a/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml +++ b/docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml @@ -669,8 +669,9 @@ session: none The Samba &smb.conf; file was configured as shown in <link linkend="ch8smbconf"/>. </para> -<smbconfexample id="ch8smbconf"> +<example id="ch8smbconf"> <title>Samba Configuration File &smbmdash; smb.conf Part A</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MEGANET2</smbconfoption> @@ -712,10 +713,12 @@ session: none <smbconfoption name="admin users">root, "@Domain Admins"</smbconfoption> <smbconfoption name="printer admin">"@Domain Admins"</smbconfoption> <smbconfoption name="force printername">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch8smbconf2"> +<example id="ch8smbconf2"> <title>Samba Configuration File &smbmdash; smb.conf Part B</title> +<smbconfblock> <smbconfsection name="[netlogon]"/> <smbconfoption name="comment">Network logon service</smbconfoption> <smbconfoption name="path">/data/samba/netlogon</smbconfoption> @@ -754,10 +757,12 @@ session: none <smbconfoption name="comment">Location of documents printed to PDFCreator printer</smbconfoption> <smbconfoption name="path">/data/samba/shares/pdf</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch8smbconf3"> +<example id="ch8smbconf3"> <title>Samba Configuration File &smbmdash; smb.conf Part C</title> +<smbconfblock> <smbconfsection name="[EVERYTHING]"/> <smbconfoption name="comment">All shares</smbconfoption> <smbconfoption name="path">/data/samba</smbconfoption> @@ -798,10 +803,12 @@ session: none <smbconfoption name="printable">Yes</smbconfoption> <smbconfoption name="use client driver">Yes</smbconfoption> <smbconfoption name="copy">printers</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch8smbconf4"> +<example id="ch8smbconf4"> <title>Samba Configuration File &smbmdash; smb.conf Part D</title> +<smbconfblock> <smbconfsection name="[APPS]"/> <smbconfoption name="path">/data/samba/shares/Apps</smbconfoption> <smbconfoption name="force group">"Domain Users"</smbconfoption> @@ -839,10 +846,12 @@ session: none <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="create mask">0770</smbconfoption> <smbconfoption name="copy">engr</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="ch8smbconf5"> +<example id="ch8smbconf5"> <title>Samba Configuration File &smbmdash; smb.conf Part E</title> +<smbconfblock> <smbconfsection name="[X]"/> <smbconfoption name="path">/data/samba/shares/X</smbconfoption> <smbconfoption name="valid users">@engr, @acct</smbconfoption> @@ -867,7 +876,8 @@ session: none <smbconfoption name="valid users">chad</smbconfoption> <smbconfoption name="read only">No</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <para> <indexterm><primary>Qbasic</primary></indexterm> diff --git a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml index 6e8a5c85a1..00d7670336 100644 --- a/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml +++ b/docs/Samba3-ByExample/SBE-SecureOfficeServer.xml @@ -804,8 +804,9 @@ echo -e "\nNAT firewall done.\n" and <link linkend="promisnetsvcb"/>. Concatenate (join) all three files to make a single &smb.conf; file. The final, fully qualified path for this file should be <filename>/etc/samba/smb.conf</filename>. -<smbconfexample id="promisnet"> +<example id="promisnet"> <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">PROMISES</smbconfoption> @@ -849,10 +850,12 @@ echo -e "\nNAT firewall done.\n" <smbconfoption name="cups options">Raw</smbconfoption> <smbconfoption name="veto files">/*.eml/*.nws/*.{*}/</smbconfoption> <smbconfoption name="veto oplock files">/*.doc/*.xls/*.mdb/</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="promisnetsvca"> +<example id="promisnetsvca"> <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A</title> +<smbconfblock> <smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> @@ -884,10 +887,12 @@ echo -e "\nNAT firewall done.\n" <smbconfoption name="comment">Accounting Files</smbconfoption> <smbconfoption name="path">/data/accounts</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="promisnetsvcb"> +<example id="promisnetsvcb"> <title>130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B</title> +<smbconfblock> <smbconfsection name="[service]"/> <smbconfoption name="comment">Financial Services Files</smbconfoption> <smbconfoption name="path">/data/service</smbconfoption> @@ -903,7 +908,8 @@ echo -e "\nNAT firewall done.\n" <smbconfoption name="path">/apps</smbconfoption> <smbconfoption name="read only">Yes</smbconfoption> <smbconfoption name="admin users">bjordan</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> </para></step> <step><para> diff --git a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml index 1213caf2d1..1c41ec9811 100644 --- a/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml +++ b/docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml @@ -186,8 +186,9 @@ Install the &smb.conf; file shown in <link linkend="draft-smbconf"/> in the <filename>/etc/samba</filename> directory. -<smbconfexample id="draft-smbconf"> +<example id="draft-smbconf"> <title>Drafting Office &smb.conf; File</title> +<smbconfblock> <smbconfcomment>Global Parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> @@ -197,7 +198,8 @@ <smbconfoption name="path">/plans</smbconfoption> <smbconfoption name="read only">Yes</smbconfoption> <smbconfoption name="guest ok">Yes</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> </para></step> <step><para> @@ -642,8 +644,9 @@ application/octet-stream </procedure> -<smbconfexample id="charity-smbconfnew"> +<example id="charity-smbconfnew"> <title>Charity Administration Office &smb.conf; New-style File</title> +<smbconfblock> <smbconfcomment>Global Parameters - Newer Configuration</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> @@ -678,10 +681,12 @@ application/octet-stream <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="use client driver">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="charity-smbconf"> +<example id="charity-smbconf"> <title>Charity Administration Office &smb.conf; Old-style File</title> +<smbconfblock> <smbconfcomment>Global Parameters - Older Style Configuration</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">MIDEARTH</smbconfoption> @@ -717,7 +722,8 @@ application/octet-stream <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="use client driver">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <procedure> <title>Windows Client Configuration</title> @@ -1278,8 +1284,9 @@ application/octet-stream </procedure> -<smbconfexample id="acctconf"> +<example id="acctconf"> <title>Accounting Office Network &smb.conf; Old Style Configuration File</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">BILLMORE</smbconfoption> @@ -1306,7 +1313,8 @@ application/octet-stream <smbconfoption name="guest ok">Yes</smbconfoption> <smbconfoption name="use client driver">Yes</smbconfoption> <smbconfoption name="browseable">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> </sect3> </sect2> diff --git a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml index 7b6f9f7600..037881c33f 100644 --- a/docs/Samba3-ByExample/SBE-TheSmallOffice.xml +++ b/docs/Samba3-ByExample/SBE-TheSmallOffice.xml @@ -630,8 +630,9 @@ hosts: files wins </procedure> -<smbconfexample id="acct2conf"> +<example id="acct2conf"> <title>Accounting Office Network &smb.conf; File &smbmdash; [globals] Section</title> +<smbconfblock> <smbconfcomment>Global parameters</smbconfcomment> <smbconfsection name="[global]"/> <smbconfoption name="workgroup">BILLMORE</smbconfoption> @@ -656,10 +657,12 @@ hosts: files wins <smbconfoption name="preferred master">Yes</smbconfoption> <smbconfoption name="wins support">Yes</smbconfoption> <smbconfoption name="printing">CUPS</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> -<smbconfexample id="acct3conf"> +<example id="acct3conf"> <title>Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section</title> +<smbconfblock> <smbconfsection name="[homes]"/> <smbconfoption name="comment">Home Directories</smbconfoption> <smbconfoption name="valid users">%S</smbconfoption> @@ -691,7 +694,8 @@ hosts: files wins <smbconfoption name="path">/data/finsvcs</smbconfoption> <smbconfoption name="valid users">%G</smbconfoption> <smbconfoption name="read only">No</smbconfoption> -</smbconfexample> +</smbconfblock> +</example> <sect2> <title>Validation</title> |