config: default to etc/ceph/ceph.conf

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
index 436e95234b49d9b85bc251002500cbba8793ba09..3bba1417247fdc7b2bea8c2156136ec6110b21ba 100644 (file)
--- a/debian/ceph-common.dirs
+++ b/debian/ceph-common.dirs
@@ -1,3 +1,4 @@
 usr/bin
 var/log/ceph
 var/log/ceph/stat
+etc/ceph
\ No newline at end of file

diff --git a/src/config.cc b/src/config.cc
index ef3db2e69d299bb3c993e8e46b1015160a8df425..64ded27176807eeaea0aa3694d743c8112130188 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -211,7 +211,7 @@ md_config_t g_conf = {
   dout_dir: INSTALL_PREFIX "/var/log/ceph",        // if daemonize == true
   dout_sym_dir: INSTALL_PREFIX "/var/log/ceph",    // if daemonize == true
   logger_dir: INSTALL_PREFIX "/var/log/ceph/stat",
-  conf_file: INSTALL_PREFIX "/etc/ceph.conf",
+  conf_file: INSTALL_PREFIX "/etc/ceph/ceph.conf",
 
   dump_conf: false,