From 775bee8fe12e42dce0c25cf77bfd7def17f2bfb5 Mon Sep 17 00:00:00 2001 From: Andreas Scherbaum Date: Thu, 6 Apr 2017 22:20:20 +0200 Subject: [PATCH] Replace http:// links with https:// links where a secure website exists Leave out tests and third party tools, and license strings fixes #5151 Signed-off-by: Michael Friedrich --- CONTRIBUTING.md | 2 +- INSTALL.md | 6 +++--- README.md | 1 - RELEASE.md | 6 +++--- lib/base/netstring.hpp | 2 +- lib/db_ido_mysql/schema/upgrade/2.0.2.sql | 2 +- lib/db_ido_mysql/schema/upgrade/2.1.0.sql | 2 +- lib/db_ido_mysql/schema/upgrade/2.2.0.sql | 2 +- lib/db_ido_mysql/schema/upgrade/2.3.0.sql | 2 +- lib/db_ido_mysql/schema/upgrade/2.4.0.sql | 2 +- lib/db_ido_mysql/schema/upgrade/2.5.0.sql | 2 +- lib/db_ido_mysql/schema/upgrade/2.6.0.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.0.2.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.1.0.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.2.0.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.3.0.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.4.0.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.5.0.sql | 2 +- lib/db_ido_pgsql/schema/upgrade/2.6.0.sql | 2 +- lib/remote/infohandler.cpp | 4 ++-- plugins/check_update.cpp | 4 ++-- tools/debug/gdb/README.md | 2 +- 22 files changed, 27 insertions(+), 28 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 863876ad4..c7c2c8d04 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,7 @@ Basic unit test coverage is provided by running `make test` during package build Read the [INSTALL.md](INSTALL.md) file for more information about development builds. Snapshot packages from the laster development branch are available inside the -[package repository](http://packages.icinga.com). +[package repository](https://packages.icinga.com). You can help test-drive the latest Icinga 2 snapshot packages inside the [Icinga 2 Vagrant boxes](https://github.com/icinga/icinga-vagrant). diff --git a/INSTALL.md b/INSTALL.md index 13c11e88f..4d8d1dcc6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -51,8 +51,8 @@ libopenssl-devel on SLES12, libssl-dev on Debian) Note: RHEL5 ships an ancient flex version. Updated packages are available for example from the repoforge buildtools repository. -* x86: http://mirror.hs-esslingen.de/repoforge/redhat/el5/en/i386/buildtools/ -* x86\_64: http://mirror.hs-esslingen.de/repoforge/redhat/el5/en/x86\_64/buildtools/ +* x86: https://mirror.hs-esslingen.de/repoforge/redhat/el5/en/i386/buildtools/ +* x86\_64: https://mirror.hs-esslingen.de/repoforge/redhat/el5/en/x86\_64/buildtools/ ### User Requirements @@ -144,7 +144,7 @@ C++11 features. cat >/etc/yum.repos.d/devtools-2.repo < [About]: #about [License]: #license diff --git a/RELEASE.md b/RELEASE.md index 482d09c21..1eb4bf12a 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -88,7 +88,7 @@ into master and merge the support branch: * Test DB IDO with MySQL and PostgreSQL. * Provision the vagrant boxes and test the release packages. -* Test the [setup wizard](http://packages.icinga.com/windows/) inside a Windows VM. +* Test the [setup wizard](https://packages.icinga.com/windows/) inside a Windows VM. * Start a new docker container and install/run icinga2. @@ -96,7 +96,7 @@ Example for CentOS7: $ docker run -ti centos:latest bash - # yum -y install http://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm + # yum -y install https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm # yum -y install icinga2 # icinga2 daemon -C @@ -132,7 +132,7 @@ and pull the current support branch. * Create a new blog post on www.icinga.com/blog * Send announcement mail to icinga-announce@lists.icinga.org -* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](http://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about) +* Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](https://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about) * Update IRC channel topic # After the release diff --git a/lib/base/netstring.hpp b/lib/base/netstring.hpp index ff9066fbc..c24cba028 100644 --- a/lib/base/netstring.hpp +++ b/lib/base/netstring.hpp @@ -31,7 +31,7 @@ class String; /** * Helper functions for reading/writing messages in the netstring format. * - * @see http://cr.yp.to/proto/netstrings.txt + * @see https://cr.yp.to/proto/netstrings.txt * * @ingroup base */ diff --git a/lib/db_ido_mysql/schema/upgrade/2.0.2.sql b/lib/db_ido_mysql/schema/upgrade/2.0.2.sql index f28ef2763..fb8834a22 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.0.2.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.0.2.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2014 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- UPDATE icinga_objects SET name2 = NULL WHERE name2 = ''; diff --git a/lib/db_ido_mysql/schema/upgrade/2.1.0.sql b/lib/db_ido_mysql/schema/upgrade/2.1.0.sql index da2569c77..244463829 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.1.0.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.1.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2014 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- ALTER TABLE `icinga_programstatus` ADD COLUMN `endpoint_name` varchar(255) character set latin1 collate latin1_general_cs default NULL; diff --git a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql index 155264f41..040c6ee3d 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2014 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- ALTER TABLE `icinga_programstatus` ADD COLUMN `program_version` varchar(64) character set latin1 collate latin1_general_cs default NULL; diff --git a/lib/db_ido_mysql/schema/upgrade/2.3.0.sql b/lib/db_ido_mysql/schema/upgrade/2.3.0.sql index d9791104c..2c43d5844 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.3.0.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.3.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2015 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql index 2a540e5fb..1064b7088 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2015 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/db_ido_mysql/schema/upgrade/2.5.0.sql b/lib/db_ido_mysql/schema/upgrade/2.5.0.sql index d0070774d..79090cf64 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.5.0.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.5.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2016 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; diff --git a/lib/db_ido_mysql/schema/upgrade/2.6.0.sql b/lib/db_ido_mysql/schema/upgrade/2.6.0.sql index cb117b2c8..fbf354452 100644 --- a/lib/db_ido_mysql/schema/upgrade/2.6.0.sql +++ b/lib/db_ido_mysql/schema/upgrade/2.6.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2016 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql b/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql index 08eb85d59..39d738650 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2014 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- UPDATE icinga_objects SET name2 = NULL WHERE name2 = ''; diff --git a/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql index 32dcce941..8efc9cc81 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2014 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- ALTER TABLE icinga_programstatus ADD COLUMN endpoint_name TEXT default NULL; diff --git a/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql index eb2d75a6f..f9d5501a5 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2014 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- ALTER TABLE icinga_programstatus ADD COLUMN program_version TEXT default NULL; diff --git a/lib/db_ido_pgsql/schema/upgrade/2.3.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.3.0.sql index 3ed1ed8f4..445deda23 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.3.0.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.3.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2015 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/db_ido_pgsql/schema/upgrade/2.4.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.4.0.sql index e611110ef..35d8dad2f 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.4.0.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.4.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2015 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql index 122997809..c9d4c2f7e 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2016 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/db_ido_pgsql/schema/upgrade/2.6.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.6.0.sql index 7219b8fe1..229e9f106 100644 --- a/lib/db_ido_pgsql/schema/upgrade/2.6.0.sql +++ b/lib/db_ido_pgsql/schema/upgrade/2.6.0.sql @@ -4,7 +4,7 @@ -- ----------------------------------------- -- Copyright (c) 2016 Icinga Development Team (https://www.icinga.com) -- --- Please check http://docs.icinga.com for upgrading information! +-- Please check https://docs.icinga.com for upgrading information! -- ----------------------------------------- -- ----------------------------------------- diff --git a/lib/remote/infohandler.cpp b/lib/remote/infohandler.cpp index e2892ee14..ce8a6a1a3 100644 --- a/lib/remote/infohandler.cpp +++ b/lib/remote/infohandler.cpp @@ -72,7 +72,7 @@ bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, result1->Set("user", user->GetName()); result1->Set("permissions", Array::FromVector(permInfo)); result1->Set("version", Application::GetAppVersion()); - result1->Set("info", "More information about API requests is available in the documentation at http://docs.icinga.com/icinga2/latest."); + result1->Set("info", "More information about API requests is available in the documentation at https://docs.icinga.com/icinga2/latest."); Array::Ptr results = new Array(); results->Add(result1); @@ -98,7 +98,7 @@ bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request, } else body += "Your user does not have any permissions.

"; - body += "

More information about API requests is available in the documentation.

"; + body += "

More information about API requests is available in the documentation.

"; response.WriteBody(body.CStr(), body.GetLength()); } diff --git a/plugins/check_update.cpp b/plugins/check_update.cpp index 03275a896..d739bc636 100644 --- a/plugins/check_update.cpp +++ b/plugins/check_update.cpp @@ -190,8 +190,8 @@ INT check_update(printInfoStruct& printInfo) */ criteria = SysAllocString(CRITERIA); - // http://msdn.microsoft.com/en-us/library/windows/desktop/aa386526%28v=vs.85%29.aspx - // http://msdn.microsoft.com/en-us/library/ff357803%28v=vs.85%29.aspx + // https://msdn.microsoft.com/en-us/library/windows/desktop/aa386526%28v=vs.85%29.aspx + // https://msdn.microsoft.com/en-us/library/ff357803%28v=vs.85%29.aspx if (debug) std::wcout << L"Querrying updates from server" << '\n'; diff --git a/tools/debug/gdb/README.md b/tools/debug/gdb/README.md index d444b4525..b00f81aea 100644 --- a/tools/debug/gdb/README.md +++ b/tools/debug/gdb/README.md @@ -37,4 +37,4 @@ You can download the one from Icinga 2 and modify all paths. $ vim ~/.gdbinit -More details in the [troubleshooting debug documentation](http://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/troubleshooting#debug). +More details in the [troubleshooting debug documentation](https://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/troubleshooting#debug).