diff --git a/core/src/dird/admin.cc b/core/src/dird/admin.cc index f920850983a..85640ec30fc 100644 --- a/core/src/dird/admin.cc +++ b/core/src/dird/admin.cc @@ -118,7 +118,7 @@ void AdminCleanup(JobControlRecord *jcr, int TermCode) " Scheduled time: %s\n" " Start time: %s\n" " End time: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), edt, jcr->jr.JobId, @@ -126,7 +126,7 @@ void AdminCleanup(JobControlRecord *jcr, int TermCode) schedt, sdt, edt, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); Dmsg0(debuglevel, "Leave AdminCleanup()\n"); diff --git a/core/src/dird/archive.cc b/core/src/dird/archive.cc index 661da522891..a9cfa19a14c 100644 --- a/core/src/dird/archive.cc +++ b/core/src/dird/archive.cc @@ -117,7 +117,7 @@ void ArchiveCleanup(JobControlRecord *jcr, int TermCode) " Scheduled time: %s\n" " Start time: %s\n" " End time: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), edt, jcr->jr.JobId, @@ -125,7 +125,7 @@ void ArchiveCleanup(JobControlRecord *jcr, int TermCode) schedt, sdt, edt, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); Dmsg0(debuglevel, "Leave ArchiveCleanup()\n"); diff --git a/core/src/dird/authenticate_console.cc b/core/src/dird/authenticate_console.cc index 88369369bb5..d810ccce65b 100644 --- a/core/src/dird/authenticate_console.cc +++ b/core/src/dird/authenticate_console.cc @@ -204,7 +204,7 @@ bool ConsoleAuthenticatorFrom_18_2::SendResponseMessage(uint32_t response_id, bo bool ConsoleAuthenticatorFrom_18_2::SendInfoMessage() { std::string message; - message += BAREOS_VENDORSUPPORT_MESSAGE; + message += BAREOS_SERVICES_MESSAGE; message += "\n"; message += "You are "; if (ua_->cons) { diff --git a/core/src/dird/backup.cc b/core/src/dird/backup.cc index 11c0feceb01..1756c06c42d 100644 --- a/core/src/dird/backup.cc +++ b/core/src/dird/backup.cc @@ -1216,7 +1216,7 @@ void GenerateBackupSummary(JobControlRecord *jcr, ClientDbRecord *cr, int msg_ty " Last Volume Bytes: %s (%sB)\n" "%s" /* Daemon status info */ "%s" /* SecureErase status */ - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -1244,7 +1244,7 @@ void GenerateBackupSummary(JobControlRecord *jcr, ClientDbRecord *cr, int msg_ty edit_uint64_with_suffix(mr.VolBytes, ec8), daemon_status.c_str(), secure_erase_status.c_str(), - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); } } /* namespace directordaemon */ diff --git a/core/src/dird/consolidate.cc b/core/src/dird/consolidate.cc index f7ffcaf5eda..1a792a24e00 100644 --- a/core/src/dird/consolidate.cc +++ b/core/src/dird/consolidate.cc @@ -350,7 +350,7 @@ void ConsolidateCleanup(JobControlRecord *jcr, int TermCode) " Scheduled time: %s\n" " Start time: %s\n" " End time: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), edt, jcr->jr.JobId, @@ -358,7 +358,7 @@ void ConsolidateCleanup(JobControlRecord *jcr, int TermCode) schedt, sdt, edt, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); Dmsg0(debuglevel, "Leave ConsolidateCleanup()\n"); diff --git a/core/src/dird/migrate.cc b/core/src/dird/migrate.cc index 1e9d6b11f7a..dadc1d67a31 100644 --- a/core/src/dird/migrate.cc +++ b/core/src/dird/migrate.cc @@ -1714,7 +1714,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord * " Last Volume Bytes: %s (%sB)\n" " SD Errors: %d\n" " SD termination status: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -1750,7 +1750,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord * edit_uint64_with_suffix(mr->VolBytes, ec5), jcr->SDErrors, sd_term_msg, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, term_code); } else { /* @@ -1765,7 +1765,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord * " End time: %s\n" " Elapsed time: %s\n" " Priority: %d\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -1776,7 +1776,7 @@ static inline void GenerateMigrateSummary(JobControlRecord *jcr, MediaDbRecord * edt, edit_utime(RunTime, elapsed, sizeof(elapsed)), jcr->JobPriority, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, term_code); } } diff --git a/core/src/dird/restore.cc b/core/src/dird/restore.cc index 429b784ea94..9c0231d8134 100644 --- a/core/src/dird/restore.cc +++ b/core/src/dird/restore.cc @@ -583,7 +583,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter " Bytes Restored: %s\n" " Rate: %.1f KB/s\n" " SD termination status: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -598,7 +598,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter edit_uint64_with_commas(jcr->jr.JobBytes, ec3), (float)kbps, sd_term_msg, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); break; default: @@ -631,7 +631,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter " FD termination status: %s\n" " SD termination status: %s\n" "%s" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -649,7 +649,7 @@ void GenerateRestoreSummary(JobControlRecord *jcr, int msg_type, const char *Ter fd_term_msg, sd_term_msg, secure_erase_status.c_str(), - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); break; } diff --git a/core/src/dird/ua_status.cc b/core/src/dird/ua_status.cc index 7649ade2153..40b8a6371d5 100644 --- a/core/src/dird/ua_status.cc +++ b/core/src/dird/ua_status.cc @@ -370,8 +370,8 @@ void ListDirStatusHeader(UaContext *ua) ua->SendMsg(_("%s Version: %s (%s) %s %s %s\n"), my_name, VERSION, BDATE, HOST_OS, DISTNAME, DISTVER); bstrftime_nc(dt, sizeof(dt), daemon_start_time); - ua->SendMsg(_("Daemon started %s. Jobs: run=%d, running=%d mode=%d db:%s support:%s\n"), - dt, num_jobs_run, JobCount(), (int)DEVELOPER_MODE, dbdrivers.c_str(), BAREOS_VENDORSUPPORT_STATUS ); + ua->SendMsg(_("Daemon started %s. Jobs: run=%d, running=%d mode=%d db:%s, %s binary\n"), + dt, num_jobs_run, JobCount(), (int)DEVELOPER_MODE, dbdrivers.c_str(), BAREOS_BINARY_INFO ); ua->SendMsg(_(" Heap: heap=%s smbytes=%s max_bytes=%s bufs=%s max_bufs=%s\n"), edit_uint64_with_commas((char *)sbrk(0)-(char *)start_heap, b1), edit_uint64_with_commas(sm_bytes, b2), diff --git a/core/src/dird/verify.cc b/core/src/dird/verify.cc index beaef56c928..9c319d4ff96 100644 --- a/core/src/dird/verify.cc +++ b/core/src/dird/verify.cc @@ -569,7 +569,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode) " Non-fatal FD errors: %d\n" " FD termination status: %s\n" " SD termination status: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -587,7 +587,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode) jcr->JobErrors, fd_term_msg, sd_term_msg, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); break; default: @@ -605,7 +605,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode) " Files Examined: %s\n" " Non-fatal FD errors: %d\n" " FD termination status: %s\n" - " Bareos vendor support: %s\n" + " Bareos binary info: %s\n" " Termination: %s\n\n"), BAREOS, my_name, VERSION, LSMDATE, HOST_OS, DISTNAME, DISTVER, @@ -621,7 +621,7 @@ void VerifyCleanup(JobControlRecord *jcr, int TermCode) edit_uint64_with_commas(jcr->JobFiles, ec1), jcr->JobErrors, fd_term_msg, - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_AND_SERVICES_MESSAGE, TermMsg); break; } diff --git a/core/src/filed/status.cc b/core/src/filed/status.cc index ce9be867c80..c14222fc70a 100644 --- a/core/src/filed/status.cc +++ b/core/src/filed/status.cc @@ -90,8 +90,8 @@ static void ListStatusHeader(StatusPacket *sp) my_name, VERSION, BDATE, VSS, HOST_OS, DISTNAME, DISTVER); sendit(msg, len, sp); bstrftime_nc(dt, sizeof(dt), daemon_start_time); - len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d support:%s\n"), - dt, num_jobs_run, JobCount(), BAREOS_VENDORSUPPORT_STATUS); + len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d running=%d, %s binary\n"), + dt, num_jobs_run, JobCount(), BAREOS_BINARY_INFO); sendit(msg, len, sp); #if defined(HAVE_WIN32) diff --git a/core/src/include/version.h b/core/src/include/version.h index 766d45ae5ab..ab05b46e57f 100644 --- a/core/src/include/version.h +++ b/core/src/include/version.h @@ -5,17 +5,22 @@ #define BDATE "10 January 2019" #define LSMDATE "10Jan19" -#ifndef BAREOS_VENDORSUPPORT_STATUS -#define BAREOS_VENDORSUPPORT_STATUS "UNSUPPORTED by vendor." +#ifndef BAREOS_BINARY_INFO +#define BAREOS_BINARY_INFO "self compiled" #endif -#ifndef BAREOS_VENDORSUPPORT_MESSAGE -#define BAREOS_VENDORSUPPORT_MESSAGE "Status: " BAREOS_VENDORSUPPORT_STATUS " Visit www.bareos.com for support offerings." +#ifndef BAREOS_SERVICES_MESSAGE +#define BAREOS_SERVICES_MESSAGE "Get official binaries and support on bareos.com" +#endif + +#ifndef BAREOS_BINARY_AND_SERVICES_MESSAGE +#define BAREOS_BINARY_AND_SERVICES_MESSAGE BAREOS_BINARY_INFO " binaries. " BAREOS_SERVICES_MESSAGE #endif #define PROG_COPYRIGHT "\n" \ - BAREOS_VENDORSUPPORT_MESSAGE \ + BAREOS_BINARY_INFO " binary" "\n" \ + BAREOS_SERVICES_MESSAGE \ "\n" \ "Copyright (C) 2013-2019 Bareos GmbH & Co. KG\n" \ "Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n" \ diff --git a/core/src/stored/bscan.cc b/core/src/stored/bscan.cc index 20cc88d553f..466e7523316 100644 --- a/core/src/stored/bscan.cc +++ b/core/src/stored/bscan.cc @@ -1426,7 +1426,7 @@ static bool UpdateJobRecord(BareosDb *db, JobDbRecord *jr, SESSION_LABEL *elabel "Volume Session Id: %d\n" "Volume Session Time: %d\n" "Last Volume Bytes: %s\n" -"Bareos vendor support: %s\n" +"Bareos binary info: %s\n" "Termination: %s\n\n"), edt, mjcr->JobId, @@ -1441,7 +1441,7 @@ static bool UpdateJobRecord(BareosDb *db, JobDbRecord *jr, SESSION_LABEL *elabel mjcr->VolSessionId, mjcr->VolSessionTime, edit_uint64_with_commas(mr.VolBytes, ec3), - BAREOS_VENDORSUPPORT_STATUS, + BAREOS_BINARY_INFO, TermMsg); } FreeJcr(mjcr); diff --git a/core/src/stored/status.cc b/core/src/stored/status.cc index be171f0d334..4b42d128a09 100644 --- a/core/src/stored/status.cc +++ b/core/src/stored/status.cc @@ -487,8 +487,8 @@ static void ListStatusHeader(StatusPacket *sp) bstrftime_nc(dt, sizeof(dt), daemon_start_time); - len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d, running=%d, support:%s\n"), - dt, num_jobs_run, JobCount(), BAREOS_VENDORSUPPORT_STATUS); + len = Mmsg(msg, _("Daemon started %s. Jobs: run=%d, running=%d, %s binary\n"), + dt, num_jobs_run, JobCount(), BAREOS_BINARY_INFO); sendit(msg, len, sp); #if defined(HAVE_WIN32) diff --git a/webui/CMakeLists.txt b/webui/CMakeLists.txt index de870387830..e7fdbcf896f 100644 --- a/webui/CMakeLists.txt +++ b/webui/CMakeLists.txt @@ -87,11 +87,10 @@ ELSE() SET(HTTPD_CONF ${sysconfdir}/httpd/conf.d) ENDIF() -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config/autoload/global.php.in ${CMAKE_CURRENT_SOURCE_DIR}/config/autoload/global.php @ONLY) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/install/directors.ini.in ${CMAKE_CURRENT_SOURCE_DIR}/install/directors.ini @ONLY) -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/install/configuration.ini.in ${CMAKE_CURRENT_SOURCE_DIR}/install/configuration.ini @ONLY) - -CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.php.in ${CMAKE_CURRENT_SOURCE_DIR}/version.php @ONLY) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config/autoload/global.php.in config/autoload/global.php @ONLY) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/install/directors.ini.in install/directors.ini @ONLY) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/install/configuration.ini.in install/configuration.ini @ONLY) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.php.in version.php @ONLY) SET(WEBUI_DIR ${SHARE_INSTALL_PREFIX}/bareos-webui) @@ -103,7 +102,7 @@ ELSE() MESSAGE("PHP not found") ENDIF() -INSTALL(FILES version.php init_autoloader.php DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui) +INSTALL(FILES init_autoloader.php version.php DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui) INSTALL(DIRECTORY tests config data module public vendor DESTINATION ${SHARE_INSTALL_PREFIX}/bareos-webui) INSTALL(FILES install/bareos/bareos-dir.d/console/admin.conf.example DESTINATION ${confdir}/bareos-dir.d/console/)