Renamed cta_catalogue_db.conf to cta-catalogue.conf

catalogue/CMakeLists.txt

@@ -118,7 +118,7 @@ target_link_libraries (ctacatalogueunittests
 
 install (TARGETS ctacatalogueunittests DESTINATION usr/${CMAKE_INSTALL_LIBDIR})
 
-install (FILES cta_catalogue_db.conf.example
+install (FILES cta-catalogue.conf.example
   DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/cta
   PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 

catalogue/cta-catalogue-admin-host-create.1cta

@@ -44,7 +44,7 @@ Prints the usage message.
 .SH RETURN VALUE
 Zero on success and non-zero on failure.
 .SH EXAMPLES
-cta-catalogue-admin-host-create /etc/cta/cta_catalogue_db.conf -u ctaadminhost -c "The CTA admin host"
+cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf -u ctaadminhost -c "The CTA admin host"
 
 .SH AUTHOR
 \fBCTA\fP Team

catalogue/cta-catalogue-admin-user-create.1cta

@@ -44,7 +44,7 @@ Prints the usage message.
 .SH RETURN VALUE
 Zero on success and non-zero on failure.
 .SH EXAMPLES
-cta-catalogue-admin-user-create /etc/cta/cta_catalogue_db.conf -u ctaadmin -c "The CTA admin account"
+cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf -u ctaadmin -c "The CTA admin account"
 
 .SH AUTHOR
 \fBCTA\fP Team

catalogue/cta-catalogue-schema-create.1cta

@@ -37,7 +37,7 @@ Prints the usage message.
 .SH RETURN VALUE
 Zero on success and non-zero on failure.
 .SH EXAMPLES
-cta-catalogue-schema-create /etc/cta/cta_catalogue_db.conf
+cta-catalogue-schema-create /etc/cta/cta-catalogue.conf
 
 .SH AUTHOR
 \fBCTA\fP Team

catalogue/cta-catalogue-schema-drop.1cta

@@ -37,7 +37,7 @@ Prints the usage message.
 .SH RETURN VALUE
 Zero on success and non-zero on failure.
 .SH EXAMPLES
-cta-catalogue-schema-drop /etc/cta/cta_catalogue_db.conf
+cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf
 
 .SH AUTHOR
 \fBCTA\fP Team

catalogue/cta-database-poll.1cta

@@ -36,7 +36,7 @@ Prints the usage message.
 .SH RETURN VALUE
 Zero on success and non-zero on failure.
 .SH EXAMPLES
-cta-database-poll 5 /etc/cta/cta_catalogue_db.conf
+cta-database-poll 5 /etc/cta/cta-catalogue.conf
 
 .SH AUTHOR
 \fBCTA\fP Team

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh

@@ -24,7 +24,7 @@ echo "Log URL file:/var/log/cta/cta-frontend.log" >>/etc/cta/cta-frontend.conf
 /opt/run/bin/init_database.sh
 . /tmp/database-rc.sh
 
-echo ${DATABASEURL} >/etc/cta/cta_catalogue_db.conf
+echo ${DATABASEURL} >/etc/cta/cta-catalogue.conf
 
 # EOS INSTANCE NAME used as username for SSS key
 EOSINSTANCE=ctaeos

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh

@@ -48,22 +48,22 @@ fi
 echo "Configuring database:"
 /opt/run/bin/init_database.sh
 . /tmp/database-rc.sh
-echo ${DATABASEURL} >/etc/cta/cta_catalogue_db.conf
+echo ${DATABASEURL} >/etc/cta/cta-catalogue.conf
 
 if [ "$KEEP_DATABASE" == "0" ]; then
   echo "Wiping database"
-  echo yes | cta-catalogue-schema-drop /etc/cta/cta_catalogue_db.conf
+  echo yes | cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf
 
   if [ "$DATABASETYPE" == "sqlite" ]; then
     mkdir -p $(dirname $(echo ${DATABASEURL} | cut -d: -f2))
-    cta-catalogue-schema-create /etc/cta/cta_catalogue_db.conf
+    cta-catalogue-schema-create /etc/cta/cta-catalogue.conf
     chmod -R 777 $(dirname $(echo ${DATABASEURL} | cut -d: -f2)) # needed?
   else
     # Oracle DB
     echo "Purging Oracle recycle bin"
     test -f ${ORACLE_SQLPLUS} || echo "ERROR: ORACLE SQLPLUS client is not present, cannot purge recycle bin: ${ORACLE_SQLPLUS}"
     LD_LIBRARY_PATH=$(readlink ${ORACLE_SQLPLUS} | sed -e 's;/bin/[^/]\+;/lib;') ${ORACLE_SQLPLUS} $(echo $DATABASEURL | sed -e 's/oracle://') @/opt/ci/init/purge_recyclebin.ext
-    cta-catalogue-schema-create /etc/cta/cta_catalogue_db.conf
+    cta-catalogue-schema-create /etc/cta/cta-catalogue.conf
   fi
 else
   echo "Reusing database (no check)"

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/taped.sh

@@ -30,7 +30,7 @@ echo "Configuring database"
 /opt/run/bin/init_database.sh
 . /tmp/database-rc.sh
 
-echo ${DATABASEURL} >/etc/cta/cta_catalogue_db.conf
+echo ${DATABASEURL} >/etc/cta/cta-catalogue.conf
 
 # cta-taped setup
   echo "taped BufferCount 10" > /etc/cta/cta-taped.conf

continuousintegration/orchestration/tests/prepare_tests.sh

@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA configuration for tests"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta_catalogue_db.conf --hostname ${ctacliIP} -c "docker cli"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta_catalogue_db.conf --username ctaadmin1 -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username ctaadmin1 -c "docker cli"
   kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
      --name ${LIBRARYNAME}                                            \
      --comment "ctasystest"                                           

continuousintegration/orchestration/tests/systest.sh

@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA for tests"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta_catalogue_db.conf --hostname ${ctacliIP} -c "docker cli"
-  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta_catalogue_db.conf --username admin1 -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
+  kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -c "docker cli"
   kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
      --name ${LIBRARYNAME}                                            \
      --comment "ctasystest"                                           

continuousintegration/orchestration/tests/systest_xrdcp_many_concurrent_files.sh

@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA for tests"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta_catalogue_db.conf --hostname ${ctacliIP} -c "docker cli"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta_catalogue_db.conf --username admin1 -c "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -c "docker cli"
 kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
       --name ${LIBRARYNAME}                                            \
       --comment "ctasystest"                                           

continuousintegration/orchestration/tests/systest_xrdcp_many_files.sh

@@ -58,8 +58,8 @@ cat ${tempdir}/library-rc.sh
 ctacliIP=`kubectl --namespace ${NAMESPACE} describe pod ctacli | grep IP | sed -E 's/IP:[[:space:]]+//'`
 
 echo "Preparing CTA for tests"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta_catalogue_db.conf --hostname ${ctacliIP} -c "docker cli"
-kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta_catalogue_db.conf --username admin1 -c "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf --hostname ${ctacliIP} -c "docker cli"
+kubectl --namespace ${NAMESPACE} exec ctafrontend -- cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf --username admin1 -c "docker cli"
 kubectl --namespace ${NAMESPACE} exec ctacli -- cta logicallibrary add \
       --name ${LIBRARYNAME}                                            \
       --comment "ctasystest"                                           

cta.spec.in

@@ -200,7 +200,7 @@ The shared libraries
 %{_libdir}/libctamessages.so*
 %{_libdir}/libctamessagesutils.so*
 %{_libdir}/libctardbms.so*
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta_catalogue_db.conf.example
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cta/cta-catalogue.conf.example
 
 #CTA-lib installs libraries so we need ldconfig.
 %post -n cta-lib -p /sbin/ldconfig

doc/latex/CTA_Admin_Install.tex

@@ -266,11 +266,11 @@ oracle:cta_test/MYSECRET@devdb12
 \end{lstlisting}
 To use this configuration to create a new database schema:
 \begin{lstlisting}
-# cta-catalogue-schema-create /etc/cta/cta_catalogue_db.conf
+# cta-catalogue-schema-create /etc/cta/cta-catalogue.conf
 \end{lstlisting}
 To drop an existing database schema:
 \begin{lstlisting}
-# cta-catalogue-schema-drop /etc/cta/cta_catalogue_db.conf
+# cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf
 WARNING
 You are about to drop the schema of the CTA calalogue database
     Database name: devdb12
@@ -433,8 +433,8 @@ must already be defined. The \texttt{cta-catalogue-admin-host-create} and \textt
 commands are provided to avoid the circular problem of not being able to use \texttt{cta admin} to create the admin
 host and user, by connecting directly to the catalogue database.
 \begin{lstlisting}
-# cta-catalogue-admin-host-create /etc/cta/cta_catalogue_db.conf -n adminhost.cern.ch -c "Administrative Host"
-# cta-catalogue-admin-user-create /etc/cta/cta_catalogue_db.conf -u admin1 -c "Administrative User"
+# cta-catalogue-admin-host-create /etc/cta/cta-catalogue.conf -n adminhost.cern.ch -c "Administrative Host"
+# cta-catalogue-admin-user-create /etc/cta/cta-catalogue.conf -u admin1 -c "Administrative User"
 \end{lstlisting}
 
 \section{Install the Tape Server}
@@ -515,7 +515,7 @@ TID="430" MSG="Configuration entry" category="taped" key="WatchdogMountMaxSecs"
 TID="430" MSG="Configuration entry" category="taped" key="WatchdogNoBlockMoveMaxSecs" value="1800" source="Compile time default"
 TID="430" MSG="Configuration entry" category="taped" key="WatchdogScheduleMaxSecs" value="60" source="Compile time default"
 TID="430" MSG="Configuration entry" category="general" key="ObjectStoreURL" value="/tmp/jobStoreVFSAgmdey" source="/etc/cta/cta.conf:2"
-TID="430" MSG="Configuration entry" category="general" key="FileCatalogConfigFile" value="/etc/cta/cta_catalogue_db.conf" source="Compile time default"
+TID="430" MSG="Configuration entry" category="general" key="FileCatalogConfigFile" value="/etc/cta/cta-catalogue.conf" source="Compile time default"
 TID="430" MSG="Configuration entry" category="TPCONFIG Entry" unitName="VDSTK1" logicalLibrary="VLSTK" devFilename="/dev/nst0" librarySlot="smc0" source="/etc/cta/TPCONFIG:1"
 TID="430" MSG="Configuration entry" category="TPCONFIG Entry" unitName="VDSTK2" logicalLibrary="VLSTK" devFilename="/dev/nst1" librarySlot="smc1" source="/etc/cta/TPCONFIG:2"
 \end{lstlisting}

objectstore/cta-objectstore-collect-orphaned-object.cpp

@@ -53,7 +53,7 @@ int main(int argc, char ** argv) {
     } else if (2 == argc) {
       cta::common::Configuration m_ctaConf("/etc/cta/cta-frontend.conf");
       be = std::move(cta::objectstore::BackendFactory::createBackend(m_ctaConf.getConfEntString("ObjectStore", "BackendPath", nullptr)));
-      const cta::rdbms::Login catalogueLogin = cta::rdbms::Login::parseFile("/etc/cta/cta_catalogue_db.conf");
+      const cta::rdbms::Login catalogueLogin = cta::rdbms::Login::parseFile("/etc/cta/cta-catalogue.conf");
       const uint64_t nbConns = 1;
       const uint64_t nbArchiveFileListingConns = 0;
       catalogue = std::move(cta::catalogue::CatalogueFactory::create(sl, catalogueLogin, nbConns, nbArchiveFileListingConns));
@@ -134,4 +134,4 @@ int main(int argc, char ** argv) {
     std::cerr << "Failed to garbage collect object: "
         << std::endl << e.what() << std::endl;
   }
-}
\ No newline at end of file
+}

tapeserver/daemon/TapedConfiguration.hpp

@@ -113,7 +113,7 @@ struct TapedConfiguration {
     "ObjectStore", "BackendPath"};
   /// Path to the file catalog config file
   SourcedParameter<std::string> fileCatalogConfigFile{
-    "general", "FileCatalogConfigFile", "/etc/cta/cta_catalogue_db.conf", "Compile time default"};
+    "general", "FileCatalogConfigFile", "/etc/cta/cta-catalogue.conf", "Compile time default"};
   
 private:
   /** A private dummy logger which will simplify the implementation of the 

xroot_plugins/XrdCtaFilesystem.cpp

@@ -281,7 +281,7 @@ XrdCtaFilesystem::XrdCtaFilesystem():
   m_backend = std::move(cta::objectstore::BackendFactory::createBackend(m_ctaConf.getConfEntString("ObjectStore", "BackendPath", nullptr)));
   m_backendPopulator = cta::make_unique<cta::objectstore::BackendPopulator>(*m_backend, "Frontend", cta::log::LogContext(*m_log));
   
-  const rdbms::Login catalogueLogin = rdbms::Login::parseFile("/etc/cta/cta_catalogue_db.conf");
+  const rdbms::Login catalogueLogin = rdbms::Login::parseFile("/etc/cta/cta-catalogue.conf");
   const uint64_t nbConns = m_ctaConf.getConfEntInt<uint64_t>("Catalogue", "NumberOfConnections", nullptr);
   const uint64_t nbArchiveFileListingConns = 2;
   m_catalogue = catalogue::CatalogueFactory::create(*m_log, catalogueLogin, nbConns, nbArchiveFileListingConns);