Changed default location of cta-taped config file within the cta-taped...

Changed default location of cta-taped config file within the cta-taped command-line arguments to /etc/cta/cta-taped.conf

tapeserver/cta-taped.cpp

@@ -108,7 +108,7 @@ static int exceptionThrowingMain(
 
   logStartOfDaemon(log, commandLine);
 
-  // Parse /etc/cta/cta.conf and /etc/cta/TPCONFIG for global parameters
+  // Parse /etc/cta/cta-taped.conf and /etc/cta/TPCONFIG for global parameters
   const TapedConfiguration globalConfig =
     TapedConfiguration::createFromCtaConf(commandLine.configFileLocation, log);
 

tapeserver/daemon/CommandLineParams.cpp

@@ -25,7 +25,7 @@ namespace cta { namespace daemon {
 
 CommandLineParams::CommandLineParams(int argc, char** argv):
   foreground(false), logToStdout(false), logToFile(false),
-  configFileLocation("/etc/cta/cta.conf"),
+  configFileLocation("/etc/cta/cta-taped.conf"),
   helpRequested(false){
   struct ::option longopts[] = {
     // { .name, .has_args, .flag, .val } (see getopt.h))

tapeserver/daemon/CommandLineParams.hpp

@@ -35,8 +35,8 @@ struct CommandLineParams{
   bool logToStdout;                 ///< Log to stdout instead of syslog. Foreground is required.
   bool logToFile;                   ///< Log to file intead of syslog.
   std::string logFilePath;
-  std::string configFileLocation;   ///< Location of the configuration file. Defaults to /etc/cta/cta.conf
+  std::string configFileLocation;   ///< Location of the configuration file. Defaults to /etc/cta/cta-taped.conf
   bool helpRequested;               ///< Help requested: will print out help and exit.
   std::list<cta::log::Param> toLogParams() const; ///< Convert the command line into set of parameters for logging.
 };
-}}
\ No newline at end of file
+}}

tapeserver/daemon/TapedConfiguration.cpp

@@ -25,7 +25,7 @@ namespace cta { namespace tape { namespace daemon {
 // GlobalConfiguration::createFromCtaConf w/o path
 //------------------------------------------------------------------------------
 TapedConfiguration TapedConfiguration::createFromCtaConf(cta::log::Logger& log) {
-  return createFromCtaConf("/etc/cta/cta.conf", log);
+  return createFromCtaConf("/etc/cta/cta-taped.conf", log);
 }
 
 //------------------------------------------------------------------------------

tapeserver/daemon/Tpconfig.cpp

@@ -107,7 +107,7 @@ Tpconfig Tpconfig::parseFile(const std::string &filename) {
         throw ex;
       }
     }
-    // This is a re-use of the container for the cta.conf representation.
+    // This is a re-use of the container for the cta-taped.conf representation.
     // There is no category nor key here.
     std::stringstream linestr;
     linestr << filename << ":" << lineNumber;
@@ -116,4 +116,4 @@ Tpconfig Tpconfig::parseFile(const std::string &filename) {
   return ret;
 }
 
-}}} // namespace cta::tape::daemon
\ No newline at end of file
+}}} // namespace cta::tape::daemon