From 33cc081ff8d3327b313b56d149f2fa74a72d73af Mon Sep 17 00:00:00 2001
From: HAT <hat@fa2.so-net.ne.jp>
Date: Sat, 8 Jan 2011 02:48:54 +0900
Subject: [PATCH] netatalk.conf: sort by service

---
 config/netatalk.conf | 71 +++++++++++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 27 deletions(-)

diff --git a/config/netatalk.conf b/config/netatalk.conf
index ea893433..f1fa38dd 100644
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,43 +1,60 @@
 # Netatalk configuration
-# Change this to increase the maximum number of clients that can connect:
-AFPD_MAX_CLIENTS=20
 
-# 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
+#########################################################################
+# Global configuration
+#########################################################################
+
+# machine's AFPserver/AppleTalk name.
 ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
 
-# specify the Mac and unix charsets to be used
-ATALK_MAC_CHARSET='MAC_ROMAN'
+# server (unix) and legacy client (<= Mac OS 9) charsets
 ATALK_UNIX_CHARSET='LOCALE'
+ATALK_MAC_CHARSET='MAC_ROMAN'
 
-# specify the UAMs to enable
-# available options: uams_guest.so, uams_clrtxt.so, uams_randnum.so, 
-# 		             uams_dhx.so, uams_dhx2.so
-# AFPD_UAMLIST="-U uams_dhx.so,uams_dhx2.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
+# 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 need legacy AppleTalk, run atalkd.
-# papd, timelord and a2boot are dependent upon atalkd.
-# If you use "AFP over TCP" server only, run only cnid_metad and afpd.
-ATALKD_RUN=no
-PAPD_RUN=no
-TIMELORD_RUN=no
-A2BOOT_RUN=no
+# If you use AFP file server, run both cnid_metad and afpd.
 CNID_METAD_RUN=yes
 AFPD_RUN=yes
 
-# Control whether the daemons are started in the background.
-# If it is dissatisfied that atalkd starts slowly, set "yes".
-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
+
+# 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
-- 
2.39.2