Skip to content

Commit

Permalink
current status
Browse files Browse the repository at this point in the history 
current statu

try to fix debian problem

fix

fix
  • Loading branch information
@pstorz
pstorz committed Jan 25, 2019
1 parent f934ba5 commit 074b03e
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 40 deletions.
4 changes: 2 additions & 2 deletions core/src/dird/admin.cc
View file
Expand Up @@ -118,15 +118,15 @@ 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,
jcr->jr.Job,
schedt,
sdt,
edt,
BAREOS_VENDORSUPPORT_STATUS,
BAREOS_BINARY_AND_SERVICES_MESSAGE,
TermMsg);

Dmsg0(debuglevel, "Leave AdminCleanup()\n");
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/archive.cc
View file
Expand Up @@ -117,15 +117,15 @@ 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,
jcr->jr.Job,
schedt,
sdt,
edt,
BAREOS_VENDORSUPPORT_STATUS,
BAREOS_BINARY_AND_SERVICES_MESSAGE,
TermMsg);

Dmsg0(debuglevel, "Leave ArchiveCleanup()\n");
Expand Down
2 changes: 1 addition & 1 deletion core/src/dird/authenticate_console.cc
View file
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/backup.cc
View file
Expand Up @@ -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,
Expand Down Expand Up @@ -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 */
4 changes: 2 additions & 2 deletions core/src/dird/consolidate.cc
View file
Expand Up @@ -350,15 +350,15 @@ 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,
jcr->jr.Job,
schedt,
sdt,
edt,
BAREOS_VENDORSUPPORT_STATUS,
BAREOS_BINARY_AND_SERVICES_MESSAGE,
TermMsg);

Dmsg0(debuglevel, "Leave ConsolidateCleanup()\n");
Expand Down
8 changes: 4 additions & 4 deletions core/src/dird/migrate.cc
View file
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
/*
Expand All @@ -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,
Expand All @@ -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);
}
}
Expand Down
8 changes: 4 additions & 4 deletions core/src/dird/restore.cc
View file
Expand Up @@ -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,
Expand All @@ -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:
Expand Down Expand Up @@ -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,
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/dird/ua_status.cc
View file
Expand Up @@ -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),
Expand Down
8 changes: 4 additions & 4 deletions core/src/dird/verify.cc
View file
Expand Up @@ -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,
Expand All @@ -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:
Expand All @@ -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,
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/filed/status.cc
View file
Expand Up @@ -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)
Expand Down
15 changes: 10 additions & 5 deletions core/src/include/version.h
View file
Expand Up @@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions core/src/stored/bscan.cc
View file
Expand Up @@ -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,
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions core/src/stored/status.cc
View file
Expand Up @@ -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)
Expand Down
11 changes: 5 additions & 6 deletions webui/CMakeLists.txt
View file
Expand Up @@ -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)
Expand All @@ -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/)
Expand Down

0 comments on commit 074b03e

Please sign in to comment.