Merge branch-2-1

[netatalk.git] / config / netatalk.conf

diff --git a/config/netatalk.conf b/config/netatalk.conf
index 681b32094e6ffd67dd8e6aeddb50a9ab0ded805d..b8c1e67b731325483351384e5f7a87c5c631efc9 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,36 +1,60 @@
-# Appletalk configuration
-# Change this to increase the maximum number of clients that can connect:
-AFPD_MAX_CLIENTS=20
+# Netatalk configuration
 
-# Change this to set the machine's atalk name and zone.
-# NOTE: if your zone has spaces in it, you're better off specifying
-#       it in afpd.conf
-#ATALK_ZONE=@zone
-ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
+#########################################################################
+# Global configuration
+#########################################################################
 
-# specify the Mac and unix charsets to be used
-ATALK_MAC_CHARSET='MAC_ROMAN'
+#### machine's AFPserver/AppleTalk name.
+#ATALK_NAME=machinename
+
+#### server (unix) and legacy client (<= Mac OS 9) charsets
 ATALK_UNIX_CHARSET='LOCALE'
+ATALK_MAC_CHARSET='MAC_ROMAN'
 
-# specify this if you don't want guest, clrtxt, and dhx
-# available options: uams_guest.so, uams_clrtxt.so, uams_dhx.so, 
-#                   uams_randnum.so
-#AFPD_UAMLIST="-U uams_clrtxt.so,uams_randnum.so"
+#### Don't Edit. export the charsets, read form ENV by apps
+export ATALK_UNIX_CHARSET
+export ATALK_MAC_CHARSET
 
-# Change this to set the id of the guest user
-AFPD_GUEST=nobody
+#########################################################################
+# AFP specific configuration
+#########################################################################
 
-# Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
-PAPD_RUN=yes
+#### Set which daemons to run.
+#### If you use AFP file server, run both cnid_metad and afpd.
 CNID_METAD_RUN=yes
 AFPD_RUN=yes
-TIMELORD_RUN=no
-A2BOOT_RUN=no
 
-# Control whether the daemons are started in the background
-ATALK_BGROUND=no
+#### maximum number of clients that can connect:
+#AFPD_MAX_CLIENTS=20
 
-# export the charsets, read form ENV by apps
-export ATALK_MAC_CHARSET
-export ATALK_UNIX_CHARSET
+#### UAMs (User Authentication Modules)
+#### available options: uams_dhx.so, uams_dhx2.so, uams_guest.so,
+####                    uams_clrtxt.so(legacy), uams_randnum.so(legacy)
+#AFPD_UAMLIST="-U uams_dhx.so,uams_dhx2.so"
+
+#### Set the id of the guest user when using uams_guest.so
+#AFPD_GUEST=nobody
+
+#### config for cnid_metad. Default log config:
+#CNID_CONFIG="-l log_note"
+
+#########################################################################
+# AppleTalk specific configuration (legacy)
+#########################################################################
+
+#### Set which legacy daemons to run.
+#### If you need AppleTalk, run atalkd.
+#### papd, timelord and a2boot are dependent upon atalkd.
+#ATALKD_RUN=no
+#PAPD_RUN=no
+#TIMELORD_RUN=no
+#A2BOOT_RUN=no
+
+#### Control whether the daemons are started in the background.
+#### If it is dissatisfied that legacy atalkd starts slowly, set "yes".
+#ATALK_BGROUND=no
+
+#### Set the AppleTalk Zone name.
+#### NOTE: if your zone has spaces in it, you're better off specifying
+####       it in afpd.conf
+#ATALK_ZONE=@zone