From 8a5498d3bfa78923cbb4e6c79e152431223a4f86 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 13 Jun 2005 00:48:46 +0000 Subject: Another set of updates; includes the new examples code and use of 10.5pt fonts. Still needs some polishing.. (This used to be commit eb11ea43f68f57d877dc80d4912396ad8e91a081) --- docs/Samba3-ByExample/SBE-2000UserNetwork.xml | 30 +++++++++++------ docs/Samba3-ByExample/SBE-500UserNetwork.xml | 36 +++++++++++++------- docs/Samba3-ByExample/SBE-AddingUNIXClients.xml | 42 ++++++++++++++++-------- docs/Samba3-ByExample/SBE-DomainAppsSupport.xml | 6 ++-- docs/Samba3-ByExample/SBE-MakingHappyUsers.xml | 36 +++++++++++++------- docs/Samba3-ByExample/SBE-MigrateNT4Samba3.xml | 12 ++++--- docs/Samba3-ByExample/SBE-MigrateNW4Samba3.xml | 30 +++++++++++------ docs/Samba3-ByExample/SBE-SecureOfficeServer.xml | 18 ++++++---- docs/Samba3-ByExample/SBE-SimpleOfficeServer.xml | 24 +++++++++----- docs/Samba3-ByExample/SBE-TheSmallOffice.xml | 12 ++++--- 10 files changed, 164 insertions(+), 82 deletions(-) (limited to 'docs/Samba3-ByExample') 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 - + Primary Domain Controller &smb.conf; File &smbmdash; Part A + Global parameters LOCALE @@ -1096,10 +1097,12 @@ index default sub 10000-20000 root cups - + + - + Primary Domain Controller &smb.conf; File &smbmdash; Part B + /tmp @@ -1130,10 +1133,12 @@ index default sub Yes Yes No - + + - + Primary Domain Controller &smb.conf; File &smbmdash; Part C + Application Files /apps @@ -1164,10 +1169,12 @@ index default sub /var/lib/samba/drivers root root, Administrator - + + - + Backup Domain Controller &smb.conf; File &smbmdash; Part A + # Global parameters LOCALE @@ -1211,10 +1218,12 @@ index default sub Financial Services Files /data/service No - + + - + Backup Domain Controller &smb.conf; File &smbmdash; Part B + Property Insurance Files /data/pidata @@ -1256,7 +1265,8 @@ index default sub /var/lib/samba/profdata No Yes - + + Key Points Learned 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 - + Server: MASSIVE (PDC), File: <filename>/etc/samba/smb.conf</filename> + Global parameters MEGANET @@ -987,11 +988,13 @@ hosts: files dns wins Property Insurance Files /data/pidata No - + + - + Server: MASSIVE (PDC), File: <filename>/etc/samba/dc-common.conf</filename> + Global parameters /var/lib/samba/scripts/shutdown.sh @@ -1021,11 +1024,13 @@ hosts: files dns wins /var/lib/samba/profiles No Yes - + + - + Common Samba Configuration File: <filename>/etc/samba/common.conf</filename> + /etc/samba/smbusers 1 @@ -1061,31 +1066,37 @@ hosts: files dns wins /apps bjordan No - + + - + Server: BLDG1 (Member), File: smb.conf + Global parameters MEGANET BLDG1 /etc/samba/dom-mem.conf - + + - + Server: BLDG2 (Member), File: smb.conf + Global parameters MEGANET BLDG2 /etc/samba/dom-mem.conf - + + - + Common Domain Member Include File: dom-mem.conf + Global parameters /var/lib/samba/scripts/shutdown.sh @@ -1095,7 +1106,8 @@ hosts: files dns wins 15000-20000 15000-20000 /etc/samba/common.conf - + + 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. - + Samba Domain Member in Samba Domain Using LDAP &smbmdash; &smb.conf; File + Global parameters LOCALE @@ -727,7 +728,8 @@ Join to 'MEGANET2' failed. /var/lib/samba/drivers root, Administrator root - + + LDIF IDMAP Add-On Load File &smbmdash; File: /etc/openldap/idmap.LDIF @@ -979,8 +981,9 @@ MEGANET2+PIOps:x:10005: - + Samba Domain Member Server Using Winbind &smb.conf; File for NT4 Domain + Global parameters LOCALE @@ -1022,7 +1025,8 @@ MEGANET2+PIOps:x:10005: /var/lib/samba/drivers root, Administrator root - + + @@ -1071,8 +1075,9 @@ Joined domain MEGANET2. - + Samba Domain Member Server Using Local Accounts &smb.conf; File for NT4 Domain + Global parameters LOCALE @@ -1114,7 +1119,8 @@ Joined domain MEGANET2. /var/lib/samba/drivers root, Administrator root - + + @@ -1672,8 +1678,9 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- May this server serve well all who happen upon it. - + Samba Domain Member &smb.conf; File for Active Directory Membership + Global parameters LOCALE @@ -1713,7 +1720,8 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- /var/lib/samba/drivers root, Administrator root - + + IDMAP_RID with Winbind @@ -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 . - + Example &smb.conf; File Using <constant>idmap_rid</constant> + Global parameters KPAK @@ -1774,7 +1783,8 @@ data = "\00\00\00\00bp\00\00\06krbtgt\06krbtgt- No Yes "KPAK\Domain Admins" - + + large domain @@ -1876,8 +1886,9 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash The example in is for an ADS-style domain. - + Typical ADS Style Domain &smb.conf; File + Global parameters SNOWSHOW @@ -1894,7 +1905,8 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash 150000-550000 /bin/bash Yes - + + realm @@ -2078,8 +2090,9 @@ Joined 'GOODELF' to realm 'SNOWSHOW.COM' An example &smb.conf; file is shown in . - + ADS Membership Using RFC2307bis Identity Resolution &smb.conf; File + Global parameters BUBBAH @@ -2093,7 +2106,8 @@ Joined 'GOODELF' to realm 'SNOWSHOW.COM' Yes Yes Yes - + + nss_ldap 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 . - + Samba Configuration &smbmdash; File: <filename>/etc/samba/smb.conf</filename> + LONDON W2K3S @@ -603,7 +604,8 @@ password: XXXXXXXX yes yes yes - + + NSS Configuration File Extract &smbmdash; File: <filename>/etc/nsswitch.conf</filename> 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. - + LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part A + Global parameters LOCALE @@ -1884,10 +1885,12 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 /opt/IDEALX/sbin/ smbldap-usermod -g "%g" "%u" /opt/IDEALX/sbin/smbldap-useradd -w "%u" - + + - + LDAP Based &smb.conf; File, Server: MASSIVE &smbmdash; global Section: Part B + scripts\logon.bat \\%L\profiles\%U X: @@ -1906,7 +1909,8 @@ SID for domain MASSIVE is: S-1-5-21-3504140859-1010554828-2431957765 Yes cups root, chrisr - + + @@ -3185,8 +3189,9 @@ smb: \> q - + LDAP Based &smb.conf; File, Server: BLDG1 + Global parameters LOCALE @@ -3220,11 +3225,13 @@ smb: \> q 10000-20000 cups root, chrisr - + + - + LDAP Based &smb.conf; File, Server: BLDG2 + Global parameters LOCALE @@ -3258,11 +3265,13 @@ smb: \> q 10000-20000 cups root, chrisr - + + - + LDAP Based &smb.conf; File, Shares Section &smbmdash; Part A + Accounting Files /data/accounts @@ -3290,10 +3299,12 @@ smb: \> q Yes Yes No - + + - + LDAP Based &smb.conf; File, Shares Section &smbmdash; Part B + Application Files /apps @@ -3325,7 +3336,8 @@ smb: \> q no yes root, chrisr - + + LDIF IDMAP Add-On Load File &smbmdash; File: /etc/openldap/idmap.LDIF 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. - + NT4 Migration Samba-3 Server <filename>smb.conf</filename> &smbmdash; Part: A + DAMNATION MERLIN @@ -446,10 +447,12 @@ Yes Yes Yes - + + - + NT4 Migration Samba-3 Server <filename>smb.conf</filename> &smbmdash; Part: B + Application Data /data/home/apps @@ -491,7 +494,8 @@ Printer Drivers /var/lib/samba/drivers - + + slapd.conf 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 . - + Samba Configuration File &smbmdash; smb.conf Part A + Global parameters MEGANET2 @@ -712,10 +713,12 @@ session: none root, "@Domain Admins" "@Domain Admins" Yes - + + - + Samba Configuration File &smbmdash; smb.conf Part B + Network logon service /data/samba/netlogon @@ -754,10 +757,12 @@ session: none Location of documents printed to PDFCreator printer /data/samba/shares/pdf Yes - + + - + Samba Configuration File &smbmdash; smb.conf Part C + All shares /data/samba @@ -798,10 +803,12 @@ session: none Yes Yes printers - + + - + Samba Configuration File &smbmdash; smb.conf Part D + /data/samba/shares/Apps "Domain Users" @@ -839,10 +846,12 @@ session: none No 0770 engr - + + - + Samba Configuration File &smbmdash; smb.conf Part E + /data/samba/shares/X @engr, @acct @@ -867,7 +876,8 @@ session: none chad No No - + + Qbasic 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 . Concatenate (join) all three files to make a single &smb.conf; file. The final, fully qualified path for this file should be /etc/samba/smb.conf. - + 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; [globals] Section + Global parameters PROMISES @@ -849,10 +850,12 @@ echo -e "\nNAT firewall done.\n" Raw /*.eml/*.nws/*.{*}/ /*.doc/*.xls/*.mdb/ - + + - + 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part A + Home Directories %S @@ -884,10 +887,12 @@ echo -e "\nNAT firewall done.\n" Accounting Files /data/accounts No - + + - + 130 User Network with <emphasis>tdbsam</emphasis> &smbmdash; Services Section Part B + Financial Services Files /data/service @@ -903,7 +908,8 @@ echo -e "\nNAT firewall done.\n" /apps Yes bjordan - + + 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 in the /etc/samba directory. - + Drafting Office &smb.conf; File + Global Parameters MIDEARTH @@ -197,7 +198,8 @@ /plans Yes Yes - + + @@ -642,8 +644,9 @@ application/octet-stream - + Charity Administration Office &smb.conf; New-style File + Global Parameters - Newer Configuration MIDEARTH @@ -678,10 +681,12 @@ application/octet-stream Yes Yes No - + + - + Charity Administration Office &smb.conf; Old-style File + Global Parameters - Older Style Configuration MIDEARTH @@ -717,7 +722,8 @@ application/octet-stream Yes Yes No - + + Windows Client Configuration @@ -1278,8 +1284,9 @@ application/octet-stream - + Accounting Office Network &smb.conf; Old Style Configuration File + Global parameters BILLMORE @@ -1306,7 +1313,8 @@ application/octet-stream Yes Yes No - + + 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 - + Accounting Office Network &smb.conf; File &smbmdash; [globals] Section + Global parameters BILLMORE @@ -656,10 +657,12 @@ hosts: files wins Yes Yes CUPS - + + - + Accounting Office Network &smb.conf; File &smbmdash; Services and Shares Section + Home Directories %S @@ -691,7 +694,8 @@ hosts: files wins /data/finsvcs %G No - + + Validation -- cgit