Merge remote branch 'origin/master' into branch-allea

[netatalk.git] / config / AppleVolumes.default.tmpl

diff --git a/config/AppleVolumes.default.tmpl b/config/AppleVolumes.default.tmpl
index ce1dc078e5e377dd59bb514900edeb524ccb570c..eeb20a859d7971a01c69d88581d5ef3a9a6aad9b 100644 (file)
--- a/config/AppleVolumes.default.tmpl
+++ b/config/AppleVolumes.default.tmpl
@@ -64,28 +64,47 @@
 #                        ignore for user defined volumes
 # root_postexec       -> command to be run as root when the volume is closed,
 #                        ignore for user defined volumes
+# veto                -> hide files and directories,where the path matches
+#                        one of the "/" delimited vetoed names. Matches are
+#                        partial, e.g. path is /abc/def/file and veto:/abc/
+#                        will hide the file.
+# adouble             -> specify the format of the metadata files.
+#                        default is "v2". netatalk 1.x used "v1".
+#                        "osx" cannot be treated normally any longer.
+# volsizelimit        -> size in MiB.  Useful for TimeMachine: limits the
+#                         reported volume size, thus preventing TM from using
+#                         the whole real disk space for backup.
+#                         Example: "volsizelimit:1000" would limit the
+#                         reported disk space to 1 GB.
+
+
 #
 # codepage options [syntax: options:charsetname]
 # volcharset          -> specifies the charset to be used
 #                        as the volume codepage
 #                        e.g. "UTF8", "UTF8-MAC", "ISO-8859-15"
 # maccharset          -> specifies the charset to be used
-#                        as the mac client codepage
+#                        as the legacy client (<=Mac OS 9) codepage
 #                        e.g. "MAC_ROMAN", "MAC_CYRILLIC"
 #
 # perm                -> default permission value
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # dperm               -> default permission value for directories
 #                        OR with the client requested perm
+#                        Use with options:upriv
 # fperm               -> default permission value for files
 #                        OR with the client requested perm
-#
+#                        Use with options:upriv
+# umask               -> set perm mask
+#                        Use with options:upriv
 # dbpath:path         -> store the database stuff in the following path.
 # cnidserver:server[:port]
-#                     -> Query this servername or IP address (default:localhost)
-#                        and port (default: 4700) for CNIDs. Only used with
-#                        CNID backend "dbd". This option here overrides any
-#                        setting from afpd.conf:cnidserver.
+#                     -> Query this servername or IP address
+#                        (default:localhost) and port (default: 4700)
+#                        for CNIDs. Only used with CNID backend "dbd".
+#                        This option here overrides any setting from
+#                        afpd.conf:cnidserver.
 # password:password   -> set a volume password (8 characters max)
 # cnidscheme:scheme   -> set the cnid scheme for the volume,
 #                        default is [:DEFAULT_CNID_SCHEME:]
@@ -141,17 +160,24 @@
 # illegalseq          -> encode illegal sequence in filename asis,
 #                        ex "\217-", which is not a valid SHIFT-JIS char,
 #                        is encoded  as U\217 -
-# acls                -> Enable ACLs on this volume. Requires a NFSv4 ACLs
-#                        compatible filesystem (e.g. ZFS) and an ACL API
-#                        compatible to *Solaris. In other words: this requires
-#                        Solaris, Opensolaris or a derived distribution.
 # nocnidcache         -> Don't store and read CNID to/from AppleDouble file.
 #                        This should not be used as it also prevents a CNID
 #                        database rebuild with `dbd`!
 # caseinsensitive     -> The underlying FS is case insensitive (only 
 #                        test with JFS in OS2 mode)
+# dropbox             -> Allows a volume to be declared as being a "dropbox."
+#                        Note that netatalk must be compiled with dropkludge
+#                        support for this to function. Warning: This option
+#                        is deprecated and might not work as expected.
+# dropkludge          -> same as "dropbox"
+# nodev               -> always use 0 for device number, helps when the
+#                        device number is not constant across a reboot,
+#                        cluster, ...
 #
 
+# The line below sets some DEFAULT, starting with Netatalk 2.1.
+:DEFAULT: options:upriv,usedots
+
 # The "~" below indicates that Home directories are visible by default.
 # If you do not wish to have people accessing their Home directories,
 # please put a pound sign in front of the tilde or delete it.