tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: automatically migrate from mainlog to windowseventlog

This commit is contained in:
Julian Brost 2021-06-04 11:17:48 +02:00
parent 05ca30a6a0
commit 23aa628665
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/CMakeLists.txt
View File

@ -56,7 +56,7 @@ if(NOT WIN32)
install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR}) install(FILES bash_completion.d/icinga2 DESTINATION ${BASHCOMPLETION_DIR})
else() else()
install_if_not_exists(icinga2/features-enabled/mainlog.conf ${ICINGA2_CONFIGDIR}/features-enabled) install_if_not_exists(icinga2/features-enabled/windowseventlog.conf ${ICINGA2_CONFIGDIR}/features-enabled)
endif() endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|Solaris|SunOS)") if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|Solaris|SunOS)")

1
etc/icinga2/features-enabled/mainlog.conf
View File

@ -1 +0,0 @@
include "../features-available/mainlog.conf"

1
etc/icinga2/features-enabled/windowseventlog.conf Normal file
View File

@ -0,0 +1 @@
include "../features-available/windowseventlog.conf"

29
icinga-installer/icinga-installer.cpp
View File

@ -213,10 +213,11 @@ static int UpgradeNSIS(void)
static int InstallIcinga(void) static int InstallIcinga(void)
{ {
std::string installDir = GetIcingaInstallPath(); std::string installDir = GetIcingaInstallPath();
std::string skelDir = installDir + "\\share\\skel";
std::string dataDir = GetIcingaDataPath(); std::string dataDir = GetIcingaDataPath();
if (!PathExists(dataDir)) { if (!PathExists(dataDir)) {
std::string sourceDir = installDir + "\\share\\skel" + std::string(1, '\0'); std::string sourceDir = skelDir + std::string(1, '\0');
std::string destinationDir = dataDir + std::string(1, '\0'); std::string destinationDir = dataDir + std::string(1, '\0');
SHFILEOPSTRUCT fop; SHFILEOPSTRUCT fop;
@ -243,6 +244,32 @@ static int InstallIcinga(void)
MkDirP(dataDir + "/var/spool/icinga2/tmp"); MkDirP(dataDir + "/var/spool/icinga2/tmp");
} }
// Upgrade from versions older than 2.13 by making the windowseventlog feature available,
// enable it by default and disable the old mainlog feature.
if (!PathExists(dataDir + "/etc/icinga2/features-available/windowseventlog.conf")) {
// Disable the old mainlog feature as it is replaced by windowseventlog by default.
std::string mainlogEnabledFile = dataDir + "/etc/icinga2/features-enabled/mainlog.conf";
if (PathExists(mainlogEnabledFile)) {
if (DeleteFileA(mainlogEnabledFile.c_str()) == 0) {
throw std::runtime_error("deleting '" + mainlogEnabledFile + "' failed");
}
}
// Install the new windowseventlog feature. As features-available/windowseventlog.conf is used as a marker file,
// copy it as the last step, so that this is run again should the upgrade be interrupted.
for (const std::string& d : {"features-enabled", "features-available"}) {
std::string sourceFile = skelDir + "/etc/icinga2/" + d + "/windowseventlog.conf";
std::string destinationFile = dataDir + "/etc/icinga2/" + d + "/windowseventlog.conf";
if (CopyFileA(sourceFile.c_str(), destinationFile.c_str(), false) == 0) {
throw std::runtime_error("copying '" + sourceFile + "' to '" + destinationFile + "' failed");
}
}
}
// TODO: In Icinga 2.14, rename features-available/mainlog.conf to mainlog.conf.deprecated
// so that it's no longer listed as an available feature.
ExecuteCommand("icacls", "\"" + dataDir + "\" /grant *S-1-5-20:(oi)(ci)m"); ExecuteCommand("icacls", "\"" + dataDir + "\" /grant *S-1-5-20:(oi)(ci)m");
ExecuteCommand("icacls", "\"" + dataDir + "\\etc\" /inheritance:r /grant:r *S-1-5-20:(oi)(ci)m *S-1-5-32-544:(oi)(ci)f"); ExecuteCommand("icacls", "\"" + dataDir + "\\etc\" /inheritance:r /grant:r *S-1-5-20:(oi)(ci)m *S-1-5-32-544:(oi)(ci)f");