From 75d6b377fb3f91bed1ef98fc34bfb69c2e598f10 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Tue, 9 Jan 2018 23:07:53 +0000 Subject: [PATCH] doc: Update config file search paths to reflect reality The config file paths listed in the docs don't match the config file paths actually searched by ceph (see `src/common/config.cc`). Update the docs to reflect the current reality. Signed-off-by: Adam Wolfe Gordon --- doc/rados/configuration/ceph-conf.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/rados/configuration/ceph-conf.rst b/doc/rados/configuration/ceph-conf.rst index d0fd36623f9..988f525d2f8 100644 --- 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: