Merge 2-1

[netatalk.git] / config / netatalk.conf

diff --git a/config/netatalk.conf b/config/netatalk.conf
index d775d52280299226bd86636719126be77fc46ab1..f1fa38dd1db17ec6802662d212f5cd4266ea8fe9 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,26 +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 you're zone has spaces in it, you're better off specifying
-#       it in afpd.conf
-#ATALK_ZONE=@zone
+#########################################################################
+# Global configuration
+#########################################################################
+
+# machine's AFPserver/AppleTalk name.
 ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
 
-# 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"
+# server (unix) and legacy client (<= Mac OS 9) charsets
+ATALK_UNIX_CHARSET='LOCALE'
+ATALK_MAC_CHARSET='MAC_ROMAN'
 
-# Change this to set the id of the guest user
-AFPD_GUEST=nobody
+# Don't Edit. export the charsets, read form ENV by apps
+export ATALK_UNIX_CHARSET
+export ATALK_MAC_CHARSET
 
-# Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
-PAPD_RUN=yes
+# Control whether the daemons are started in the background.
+# If it is dissatisfied that legacy atalkd starts slowly, set "yes".
+ATALK_BGROUND=no
+
+#########################################################################
+# AFP specific configuration
+#########################################################################
+
+# Set which daemons to run.
+# If you use AFP file server, run both cnid_metad and afpd.
+CNID_METAD_RUN=yes
 AFPD_RUN=yes
+
+# maximum number of clients that can connect:
+AFPD_MAX_CLIENTS=20
+
+# 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
-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