From 9932f0475110d94329087193c1bd37b498e347e9 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 27 Aug 2019 16:46:51 +0200 Subject: [PATCH 1/3] Update doc URL references for the DB IDO feature --- lib/db_ido_mysql/idomysqlconnection.cpp | 2 +- lib/db_ido_pgsql/idopgsqlconnection.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index fc4def69b..5dbaba071 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -316,7 +316,7 @@ void IdoMysqlConnection::Reconnect() Log(LogCritical, "IdoMysqlConnection") << "Schema version '" << version << "' does not match the required version '" << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation at " - << "https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/upgrading-icinga-2#upgrading-mysql-db"; + << "https://icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/#upgrading-mysql-db"; BOOST_THROW_EXCEPTION(std::runtime_error("Schema version mismatch.")); } diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index 96e5ec1e3..e458e0d63 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -288,7 +288,7 @@ void IdoPgsqlConnection::Reconnect() Log(LogCritical, "IdoPgsqlConnection") << "Schema version '" << version << "' does not match the required version '" << IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation at " - << "https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/upgrading-icinga-2#upgrading-postgresql-db"; + << "https://icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/#upgrading-postgresql-db"; BOOST_THROW_EXCEPTION(std::runtime_error("Schema version mismatch.")); } From 0915c84530fa31d6867c3230619116ed9e668e64 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 27 Aug 2019 16:47:07 +0200 Subject: [PATCH 2/3] Update doc URL for the API info handler at /v1 --- lib/remote/infohandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp index d9d6b45cb..18c18c0e0 100644 --- a/lib/remote/infohandler.cpp +++ b/lib/remote/infohandler.cpp @@ -65,7 +65,7 @@ bool InfoHandler::HandleRequest( { "user", user->GetName() }, { "permissions", Array::FromVector(permInfo) }, { "version", Application::GetAppVersion() }, - { "info", "More information about API requests is available in the documentation at https://docs.icinga.com/icinga2/latest." } + { "info", "More information about API requests is available in the documentation at https://icinga.com/docs/icinga2/latest/" } }); Dictionary::Ptr result = new Dictionary({ @@ -90,7 +90,7 @@ bool InfoHandler::HandleRequest( } else body += "Your user does not have any permissions.

"; - body += R"(

More information about API requests is available in the documentation.

)"; + body += R"(

More information about API requests is available in the documentation.

)"; response.body() = body; response.set(http::field::content_length, response.body().size()); } From 0cef00c84127a1da556392ce5889082df6c42a07 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 27 Aug 2019 16:47:58 +0200 Subject: [PATCH 3/3] Update default cipher_list in upgrading docs --- doc/16-upgrading-icinga-2.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/16-upgrading-icinga-2.md b/doc/16-upgrading-icinga-2.md index 5ffbc7fce..ffaa02505 100644 --- a/doc/16-upgrading-icinga-2.md +++ b/doc/16-upgrading-icinga-2.md @@ -133,7 +133,7 @@ other than explicitly setting the allowed ciphers. The new default sets this to: ``` -ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256 +ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384 ``` You can override this setting in the [api](09-object-types.md#objecttype-apilistener)