Merge branch 'master' of git://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk...

[netatalk.git] / config / netatalk.conf

diff --git a/config/netatalk.conf b/config/netatalk.conf
index f1fa38dd1db17ec6802662d212f5cd4266ea8fe9..a050460f59f99b297cf01572f0207a30863aa8d4 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,60 +1,61 @@
-# Netatalk configuration
+# Netatalk 2.x configuration
 
 #########################################################################
 # Global configuration
 #########################################################################
 
-# machine's AFPserver/AppleTalk name.
-ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
+#### machine's AFPserver/AppleTalk name.
+#ATALK_NAME=machinename
 
-# server (unix) and legacy client (<= Mac OS 9) charsets
+#### server (unix) and legacy client (<= Mac OS 9) charsets
 ATALK_UNIX_CHARSET='LOCALE'
 ATALK_MAC_CHARSET='MAC_ROMAN'
 
-# Don't Edit. export the charsets, read form ENV by apps
+#### Don't Edit. export the charsets, read form ENV by apps
 export ATALK_UNIX_CHARSET
 export ATALK_MAC_CHARSET
 
-# 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.
+#### 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
+#### 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"
+#### 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
+#### 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"
+#### 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
+#### 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".
+#### In case using systemd/systemctl, this is not so significant.
+#ATALK_BGROUND=no
+
+#### Set the AppleTalk Zone name.
+#### NOTE: if your zone has spaces in it, you're better off specifying
+####       it in atalkd.conf
 #ATALK_ZONE=@zone