New AFP signature algorithm, from HAT

[netatalk.git] / config / afpd.conf.tmpl

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index d3d380cfe625888b3686760981e8ab2c1ca89836..91ac7c6f938f0aeb23777fc6a54e55eceea97e83 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -12,12 +12,12 @@
 #
 # The following options are available:
 #   Transport Protocols:
-#     -[no]tcp       Make AFP-over-TCP [not] available
-#     -[no]ddp       Make AFP over AppleTalk [not] available. if you
-#                    have -proxy specified, specify -uamlist "" to 
+#     -[no]tcp       Make "AFP over TCP" [not] available
+#     -[no]ddp       Make "AFP over AppleTalk" [not] available.
+#                    If you have -proxy specified, specify -uamlist "" to 
 #                    prevent ddp connections from working.
 #
-#     -transall      Make both available (default)
+#     -transall      Make both available
 #
 #   Transport Options:
 #     -ipaddr <w.x.y.z>   Specifies the IP address the server should respond
@@ -49,7 +49,7 @@
 #                         if you don't want the proxy server to act as
 #                         a ddp server as well, set -uamlist to an
 #                        empty string.
-#     -noslp              Don't register this server with the Service
+#     -slp                Register this server with the Service
 #                        Location Protocol.
 #
 #
@@ -150,11 +150,11 @@
 #
 #                         By default (no explicit -setuplog and no buildtime configure flag
 #                         --with-logfile) afpd logs to syslog with a default
-#                         logging setup equivalent to "-setuplog default log_note".
+#                         logging setup equivalent to "-setuplog default log_info".
 #               
 #                         If build with --with-logfile[=somefile] (default logfile
 #                         /var/log/netatalk.log) afpd defaults to a setup that is equivalent
-#                         to "-setuplog default log_note [netatalk.log|somefile]"
+#                         to "-setuplog default log_info [netatalk.log|somefile]"
 #
 #                         logtypes:  Default, AFPDaemon, Logger, UAMSDaemon
 #                         loglevels: LOG_SEVERE, LOG_ERROR, LOG_WARN, LOG_NOTE, LOG_INFO, LOG_DEBUG,
@@ -166,12 +166,15 @@
 #                         Debugging config
 #                         -setuplog "default log_maxdebug /var/log/afpd.log"
 #
-#     -signature { user:<text> | host }
+#     -signature { user:<text> | auto }
 #                         Specify a server signature. This option is useful while
 #                         running multiple independent instances of afpd on one 
 #                         machine (eg. in clustered environments, to provide fault
-#                         isolation etc.). "host" signature type allows afpd generating
-#                         signature automatically (based on machine primary IP address).
+#                         isolation etc.).
+#                         Default is "auto".
+#                         "auto" signature type allows afpd generating signature and
+#                         saving it to afp_signature.conf automatically (based on random number).
+#                         "host" signature type is obsoleted. (switch back to auto)
 #                         "user" signature type allows administrator to set up a signature
 #                         string manually. Examples: three servers running on one machine:
 #           first       -signature user:USERS
@@ -223,5 +226,6 @@
 #              "User Volume" -uamlist uams_clrtxt.so -port 12000
 #              "special" -notcp -defaultvol <path> -systemvol <path>
 #
+
 # default:
-# - -transall -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword
+# - -tcp -noddp -uamlist uams_dhx.so,uams_dhx2.so -nosavepassword