Merge branch '2.7' into stable

cvmfs · Jan 27, 2020 · 4e5ea0a · 4e5ea0a
2 parents dc38fa5 + 7d226b6
commit 4e5ea0a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/apx-parameters.rst b/apx-parameters.rst
@@ -166,6 +166,8 @@ CVMFS_GENERATE_LEGACY_BULK_CHUNKS   | Set to *false* to disable generation of wh
                                     | Requires clients >= 2.1.7.
 CVMFS_GC_DELETION_LOG               | Log file path to track all garbage collected objects during sweeping
                                     | for bookkeeping or debugging
+CVMFS_GEO_DB_FILE                   Path to externally updated location of geolite2 city database, or 'None' for no database.
+CVMFS_GEO_LICENSE_KEY               A license key for downloading the geolite2 city database from maxmind.
 CVMFS_GID_MAP                       Path of a file for the mapping of file owner group ids.
 CVMFS_HASH_ALGORITHM                | Define which secure hash algorithm should be used by CernVM-FS for CAS objects
                                     | (supported are: *sha1*, *rmd160* and *shake128*)