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

Merge pull request #7451 from Icinga/bugfix/update-docs 

Update docs: Fix online URL, cipher list
This commit is contained in:
Michael Friedrich 2019-08-28 08:59:28 +02:00 committed by GitHub
parent 5ed91098d2 0cef00c841
commit f62db49d3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/16-upgrading-icinga-2.md
View File

@ -133,7 +133,7 @@ other than explicitly setting the allowed ciphers.
The new default sets this to: 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) You can override this setting in the [api](09-object-types.md#objecttype-apilistener)

2
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -316,7 +316,7 @@ void IdoMysqlConnection::Reconnect()
Log(LogCritical, "IdoMysqlConnection") Log(LogCritical, "IdoMysqlConnection")
<< "Schema version '" << version << "' does not match the required version '" << "Schema version '" << version << "' does not match the required version '"
<< IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation at " << 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.")); BOOST_THROW_EXCEPTION(std::runtime_error("Schema version mismatch."));
} }

2
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -288,7 +288,7 @@ void IdoPgsqlConnection::Reconnect()
Log(LogCritical, "IdoPgsqlConnection") Log(LogCritical, "IdoPgsqlConnection")
<< "Schema version '" << version << "' does not match the required version '" << "Schema version '" << version << "' does not match the required version '"
<< IDO_COMPAT_SCHEMA_VERSION << "' (or newer)! Please check the upgrade documentation at " << 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.")); BOOST_THROW_EXCEPTION(std::runtime_error("Schema version mismatch."));
} }

4
lib/remote/infohandler.cpp
View File

@ -65,7 +65,7 @@ bool InfoHandler::HandleRequest(
{ "user", user->GetName() }, { "user", user->GetName() },
{ "permissions", Array::FromVector(permInfo) }, { "permissions", Array::FromVector(permInfo) },
{ "version", Application::GetAppVersion() }, { "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({ Dictionary::Ptr result = new Dictionary({
@ -90,7 +90,7 @@ bool InfoHandler::HandleRequest(
} else } else
body += "Your user does not have any permissions.</p>"; body += "Your user does not have any permissions.</p>";
body += R"(<p>More information about API requests is available in the <a href="https://docs.icinga.com/icinga2/latest" target="_blank">documentation</a>.</p></html>)"; body += R"(<p>More information about API requests is available in the <a href="https://icinga.com/docs/icinga2/latest/" target="_blank">documentation</a>.</p></html>)";
response.body() = body; response.body() = body;
response.set(http::field::content_length, response.body().size()); response.set(http::field::content_length, response.body().size());
} }