Consistently set default UAMs to DHX,DHX2. From HAT. Merge from 2-0

[netatalk.git] / config / netatalk.conf

diff --git a/config/netatalk.conf b/config/netatalk.conf
index 0f8f7c458e8384073b363066933835f3409aa9df..458fe1a31e677195135d8baff566d7925591146c 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,25 +1,39 @@
-# Appletalk configuration
+# 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 you're zone has spaces in it, you're better off specifying
+# 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`
 
-# 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"
+# specify the Mac and unix charsets to be used
+ATALK_MAC_CHARSET='MAC_ROMAN'
+ATALK_UNIX_CHARSET='LOCALE'
+
+# 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"
 
 # Change this to set the id of the guest user
 AFPD_GUEST=nobody
 
 # Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
-PAPD_RUN=yes
+ATALKD_RUN=no
+PAPD_RUN=NO
+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
+
+# export the charsets, read form ENV by apps
+export ATALK_MAC_CHARSET
+export ATALK_UNIX_CHARSET
+
+# log config for cnid_metad and cnid_dbd
+CNID_DBD_LOGCONFIG="-l default log_note"
\ No newline at end of file