]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
common/config: Add /usr/local/etc/ceph to default paths
authorWillem Jan Withagen <wjw@digiware.nl>
Wed, 26 Apr 2017 07:45:37 +0000 (09:45 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Wed, 26 Apr 2017 07:45:37 +0000 (09:45 +0200)
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/common/config.cc

index 9bad60b31ffb20cc3741d548753566df4e710f90..20cd08e2544e5c665cd68df03e61e63826c9d046 100644 (file)
@@ -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)