Changeset 2498 for box/trunk/lib/server/Daemon.cpp

Timestamp:

10/04/2009 00:05:28 (3 years ago)

Author:

chris

Message:

Change default location for config files from /etc/box to
/etc/boxbackup, thanks to Reinhard Tartler and the Debian Project.

File:

• box/trunk/lib/server/Daemon.cpp (modified) (2 diffs)

box/trunk/lib/server/Daemon.cpp

@@ -337 +337 @@
         {
                 mConfigFileName = argv[optind]; optind++;
+                mHaveConfigFile = true;
         }
 
@@ -376 +377 @@
         try
         {
+                if (!FileExists(rConfigFileName.c_str()))
+                {
+                        BOX_FATAL("The main configuration file for " <<
+                                DaemonName() << " was not found: " <<
+                                rConfigFileName);
+                        if (!mHaveConfigFile)
+                        {
+                                BOX_WARNING("The default configuration "
+                                        "directory has changed from /etc/box "
+                                        "to /etc/boxbackup");
+                        }
+                        return false;
+                }
+                        
                 apConfig = Configuration::LoadAndVerify(rConfigFileName,
                         GetConfigVerify(), errors);