From: Sage Weil <sage@newdream.net>
Date: Fri, 27 Feb 2009 01:36:25 +0000 (-0800)
Subject: config: default to etc/ceph/ceph.conf
X-Git-Tag: v0.7~128
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40459d5c51a13885208ee72ee277a3e3bd1ecccb;p=ceph.git

config: default to etc/ceph/ceph.conf
---

diff --git a/debian/ceph-common.dirs b/debian/ceph-common.dirs
index 436e95234b49..3bba1417247f 100644
--- 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 ef3db2e69d29..64ded2717680 100644
--- 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,