From: Willem Jan Withagen <wjw@digiware.nl>
Date: Wed, 26 Apr 2017 07:45:37 +0000 (+0200)
Subject: common/config: Add /usr/local/etc/ceph to default paths
X-Git-Tag: v12.0.3~211^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abcdb0768cb94ca140f17cbce54831397cc3472c;p=ceph.git

common/config: Add /usr/local/etc/ceph to default paths

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/common/config.cc b/src/common/config.cc
index 9bad60b31ffb..20cd08e2544e 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -63,7 +63,11 @@ using std::pair;
 using std::set;
 using std::string;
 
-const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config, /etc/ceph/$cluster.conf, ~/.ceph/$cluster.conf, $cluster.conf";
+const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config, /etc/ceph/$cluster.conf, ~/.ceph/$cluster.conf, $cluster.conf"
+#if defined(__FreeBSD__)
+    ", /usr/local/etc/ceph/$cluster.conf"
+#endif
+    ;
 
 #define _STR(x) #x
 #define STRINGIFY(x) _STR(x)