Merge pull request #19882 from adamwg/awg/fix-config-docs

doc: Update config file search paths to reflect reality
ceph · Jan 10, 2018 · 1d12dd4 · 1d12dd4
2 parents 206a53e + 75d6b37
commit 1d12dd4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/doc/rados/configuration/ceph-conf.rst b/doc/rados/configuration/ceph-conf.rst
@@ -44,10 +44,12 @@ The default Ceph configuration file locations in sequential order include:
 #. ``$CEPH_CONF`` (*i.e.,* the path following the ``$CEPH_CONF`` 
    environment variable)
 #. ``-c path/path``  (*i.e.,* the ``-c`` command line argument)
-#. ``/etc/ceph/ceph.conf``
-#. ``~/.ceph/config``
-#. ``./ceph.conf`` (*i.e.,* in the current working directory)
+#. ``/etc/ceph/$cluster.conf``
+#. ``~/.ceph/$cluster.conf``
+#. ``./$cluster.conf`` (*i.e.,* in the current working directory)
+#. On FreeBSD systems only, ``/usr/local/etc/ceph/$cluster.conf``
 
+where ``$cluster`` is the cluster's name (default ``ceph``).
 
 The Ceph configuration file uses an *ini* style syntax. You can add comments 
 by preceding comments with a pound sign (#) or a semi-colon (;).  For example: