diff --git a/CMakeLists.txt b/CMakeLists.txt
index be16dae79..3556d3a96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,7 +381,7 @@ if(ICINGA2_WITH_TESTS)
endif()
set(CPACK_PACKAGE_NAME "Icinga 2")
-set(CPACK_PACKAGE_VENDOR "Icinga Development Team")
+set(CPACK_PACKAGE_VENDOR "Icinga GmbH")
set(CPACK_PACKAGE_VERSION ${ICINGA2_VERSION})
set(CPACK_PACKAGE_INSTALL_DIRECTORY "ICINGA2")
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/icinga-app\\\\icinga.ico")
diff --git a/agent/windows-setup-agent/Properties/AssemblyInfo.cs b/agent/windows-setup-agent/Properties/AssemblyInfo.cs
index 34d61840c..d390a87ec 100644
--- a/agent/windows-setup-agent/Properties/AssemblyInfo.cs
+++ b/agent/windows-setup-agent/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("Icinga 2 Agent Wizard")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Icinga Development Team")]
+[assembly: AssemblyCompany("Icinga GmbH")]
[assembly: AssemblyProduct("Icinga 2")]
-[assembly: AssemblyCopyright("Copyright © 2014-2018 Icinga Development Team")]
+[assembly: AssemblyCopyright("Copyright © 2014 Icinga GmbH")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
diff --git a/choco/icinga2.nuspec.cmake b/choco/icinga2.nuspec.cmake
index 59af944f4..1b1465df6 100755
--- a/choco/icinga2.nuspec.cmake
+++ b/choco/icinga2.nuspec.cmake
@@ -7,8 +7,8 @@
icinga2
Icinga 2
${SPEC_VERSION}
- The Icinga Project
- Icinga Development Team
+ Icinga GmbH
+ Icinga GmbH
icinga2 - Monitoring Agent for Windows
Icinga 2 is an open source monitoring platform which notifies users about host and service outages.
https://icinga.com/
diff --git a/cmake/InstallConfig.cmake b/cmake/InstallConfig.cmake
index 3f24b39d0..70eae91e6 100644
--- a/cmake/InstallConfig.cmake
+++ b/cmake/InstallConfig.cmake
@@ -1,20 +1,5 @@
-# Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com)
+# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
# Install $src into directory $dest - usually only used for config files
#
# * similar to install() a non absolute path is prefixed with CMAKE_INSTALL_PREFIX on runtime
@@ -22,6 +7,7 @@
# * DESTDIR is prefixed as well
#
# also see https://cmake.org/cmake/help/latest/command/install.html
+
function(install_if_not_exists src dest)
if(NOT IS_ABSOLUTE "${src}")
set(src "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
diff --git a/cmake/SetFullDir.cmake b/cmake/SetFullDir.cmake
index 3e9e2236a..8dce669af 100644
--- a/cmake/SetFullDir.cmake
+++ b/cmake/SetFullDir.cmake
@@ -1,20 +1,5 @@
-# Icinga 2
-# Copyright (C) 2018 Icinga Development Team (https://icinga.com)
+# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
# Ensures a directory is absolute by prefixing CMAKE_INSTALL_PREFIX if it is not
# similar to CMAKE_INSTALL_FULL_... https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
function(set_full_dir var path)
diff --git a/contrib/GPLHeader b/contrib/GPLHeader
index 3fd58b106..9b2cfd1a2 100644
--- a/contrib/GPLHeader
+++ b/contrib/GPLHeader
@@ -1,19 +1 @@
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
-
+# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
diff --git a/doc/icinga2.8 b/doc/icinga2.8
index ca177eefd..e229f3f72 100644
--- a/doc/icinga2.8
+++ b/doc/icinga2.8
@@ -92,7 +92,7 @@ Report bugs at
.br
Icinga home page:
.SH COPYRIGHT
-Copyright \(co 2012\-2014 Icinga Development Team (https://icinga.com)
+Copyright \(co 2012 Icinga GmbH
License GPLv2+: GNU GPL version 2 or later
.br
This is free software: you are free to change and redistribute it.
diff --git a/doc/update-links.py b/doc/update-links.py
index e569b0d84..765d4a04f 100755
--- a/doc/update-links.py
+++ b/doc/update-links.py
@@ -1,20 +1,5 @@
#!/usr/bin/env python
-# Icinga 2
-# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
import os
import sys
diff --git a/etc/icinga2/scripts/mail-host-notification.sh b/etc/icinga2/scripts/mail-host-notification.sh
index 958e2d639..9755bd169 100755
--- a/etc/icinga2/scripts/mail-host-notification.sh
+++ b/etc/icinga2/scripts/mail-host-notification.sh
@@ -1,7 +1,6 @@
#!/bin/sh
-#
-# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
-# Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
+# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
+# Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
PROG="`basename $0`"
ICINGA2HOST="`hostname`"
diff --git a/etc/icinga2/scripts/mail-service-notification.sh b/etc/icinga2/scripts/mail-service-notification.sh
index 55edf4876..8e113103d 100755
--- a/etc/icinga2/scripts/mail-service-notification.sh
+++ b/etc/icinga2/scripts/mail-service-notification.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-#
-# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
+# Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
# Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license
PROG="`basename $0`"
diff --git a/icinga-app/icinga.rc b/icinga-app/icinga.rc
index 9294f989b..dbd317be6 100644
--- a/icinga-app/icinga.rc
+++ b/icinga-app/icinga.rc
@@ -16,11 +16,11 @@ BEGIN
BEGIN
BLOCK "040904E4"
BEGIN
- VALUE "CompanyName", "Icinga Development Team"
+ VALUE "CompanyName", "Icinga GmbH"
VALUE "FileDescription", "Icinga 2"
VALUE "FileVersion", VERSION
VALUE "InternalName", "icinga2.exe"
- VALUE "LegalCopyright", "© Icinga Development Team"
+ VALUE "LegalCopyright", "© Icinga GmbH"
VALUE "OriginalFilename", "icinga2.exe"
VALUE "ProductName", "Icinga 2"
VALUE "ProductVersion", VERSION
@@ -31,4 +31,4 @@ BEGIN
BEGIN
VALUE "Translation", 0x409, 0x04E4
END
-END
\ No newline at end of file
+END
diff --git a/icinga-installer/icinga-installer.cpp b/icinga-installer/icinga-installer.cpp
index 268bb9b95..233f90cab 100644
--- a/icinga-installer/icinga-installer.cpp
+++ b/icinga-installer/icinga-installer.cpp
@@ -111,6 +111,7 @@ static void MkDirP(const std::string& path)
static std::string GetNSISInstallPath(void)
{
HKEY hKey;
+ //TODO: Change hardcoded key
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\Icinga Development Team\\ICINGA2", 0,
KEY_QUERY_VALUE | KEY_WOW64_32KEY, &hKey) == ERROR_SUCCESS) {
BYTE pvData[MAX_PATH];
diff --git a/lib/cli/troubleshootcommand.cpp b/lib/cli/troubleshootcommand.cpp
index 934678688..0c462558d 100644
--- a/lib/cli/troubleshootcommand.cpp
+++ b/lib/cli/troubleshootcommand.cpp
@@ -1,21 +1,4 @@
-/*****************************************************************************
-* Icinga 2 *
-* Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) *
-* *
-* This program is free software; you can redistribute it and/or *
-* modify it under the terms of the GNU General Public License *
-* as published by the Free Software Foundation; either version 2 *
-* of the License, or (at your option) any later version. *
-* *
-* This program is distributed in the hope that it will be useful, *
-* but WITHOUT ANY WARRANTY; without even the implied warranty of *
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
-* GNU General Public License for more details. *
-* *
-* You should have received a copy of the GNU General Public License *
-* along with this program; if not, write to the Free Software Foundation *
-* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
-******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
#include "base/application.hpp"
#include "base/console.hpp"
diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll
index 5fae7aabc..71f1b96c7 100644
--- a/lib/config/config_lexer.ll
+++ b/lib/config/config_lexer.ll
@@ -1,22 +1,5 @@
%{
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
#include "config/configcompiler.hpp"
#include "config/expression.hpp"
diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index bad5796bd..4e0d536cc 100644
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -1,24 +1,7 @@
%{
#define YYDEBUG 1
-
-/******************************************************************************
- * Icinga 2 *
- * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
- * as published by the Free Software Foundation; either version 2 *
- * of the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the Free Software Foundation *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
- ******************************************************************************/
+
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
#include "config/i2-config.hpp"
#include "config/configcompiler.hpp"
diff --git a/lib/db_ido_mysql/schema/mysql.sql b/lib/db_ido_mysql/schema/mysql.sql
index 6fec218c5..bf0461fba 100644
--- a/lib/db_ido_mysql/schema/mysql.sql
+++ b/lib/db_ido_mysql/schema/mysql.sql
@@ -2,7 +2,7 @@
-- mysql.sql
-- DB definition for IDO MySQL
--
--- Copyright (c) 2009-2018 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- -- --------------------------------------------------------
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 968e1d694..c622ae9a6 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.0.2.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.0.2.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.0.2
--
-- -----------------------------------------
--- Copyright (c) 2014 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 e386da421..7bbed721b 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.1.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.1.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.1.0
--
-- -----------------------------------------
--- Copyright (c) 2014 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 c0462e866..22a611531 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.2.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.2.0
--
-- -----------------------------------------
--- Copyright (c) 2014 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 27d37ff04..f2fe463b1 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.3.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.3.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.3.0
--
-- -----------------------------------------
--- Copyright (c) 2015 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- 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 28e8ad27d..f6803f715 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.4.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.4.0
--
-- -----------------------------------------
--- Copyright (c) 2015 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- 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 cd7aabb48..d5714a0cb 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.5.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.5.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.5.0
--
-- -----------------------------------------
--- Copyright (c) 2016 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 672f8c9b8..33dd780b3 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.6.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.6.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.6.0
--
-- -----------------------------------------
--- Copyright (c) 2016 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
diff --git a/lib/db_ido_mysql/schema/upgrade/2.8.0.sql b/lib/db_ido_mysql/schema/upgrade/2.8.0.sql
index 680f1b5c4..8d511a757 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.8.0.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.8.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.8.0
--
-- -----------------------------------------
--- Copyright (c) 2017 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
diff --git a/lib/db_ido_mysql/schema/upgrade/2.8.1.sql b/lib/db_ido_mysql/schema/upgrade/2.8.1.sql
index 0c558f77d..98f851143 100644
--- a/lib/db_ido_mysql/schema/upgrade/2.8.1.sql
+++ b/lib/db_ido_mysql/schema/upgrade/2.8.1.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.8.1 (fix for fresh 2.8.0 installation only)
--
-- -----------------------------------------
--- Copyright (c) 2018 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
diff --git a/lib/db_ido_pgsql/schema/pgsql.sql b/lib/db_ido_pgsql/schema/pgsql.sql
index 46697ee8c..242b6db5c 100644
--- a/lib/db_ido_pgsql/schema/pgsql.sql
+++ b/lib/db_ido_pgsql/schema/pgsql.sql
@@ -2,7 +2,7 @@
-- pgsql.sql
-- DB definition for IDO Postgresql
--
--- Copyright (c) 2009-2018 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- --------------------------------------------------------
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 6c6fd2126..60710efd3 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.0.2.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.0.2
--
-- -----------------------------------------
--- Copyright (c) 2014 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 6c5acfdce..a32ecea51 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.1.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.1.0
--
-- -----------------------------------------
--- Copyright (c) 2014 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 e3af07a3b..d105a34be 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.2.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.2.0
--
-- -----------------------------------------
--- Copyright (c) 2014 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
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 aa693f273..91764de64 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.3.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.3.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.3.0
--
-- -----------------------------------------
--- Copyright (c) 2015 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- 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 e4b3e16c8..4a6e45eb9 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.4.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.4.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.4.0
--
-- -----------------------------------------
--- Copyright (c) 2015 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- 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 db7cc246b..063a812d6 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.5.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.5.0
--
-- -----------------------------------------
--- Copyright (c) 2016 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- 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 f7c3a709e..aa538a62d 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.6.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.6.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.6.0
--
-- -----------------------------------------
--- Copyright (c) 2016 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
diff --git a/lib/db_ido_pgsql/schema/upgrade/2.8.0.sql b/lib/db_ido_pgsql/schema/upgrade/2.8.0.sql
index e11ba03ce..31ab3246b 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.8.0.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.8.0.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.8.0
--
-- -----------------------------------------
--- Copyright (c) 2017 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
diff --git a/lib/db_ido_pgsql/schema/upgrade/2.8.1.sql b/lib/db_ido_pgsql/schema/upgrade/2.8.1.sql
index ebff8fc9c..05202c03d 100644
--- a/lib/db_ido_pgsql/schema/upgrade/2.8.1.sql
+++ b/lib/db_ido_pgsql/schema/upgrade/2.8.1.sql
@@ -2,7 +2,7 @@
-- upgrade path for Icinga 2.8.1 (fix for fresh 2.8.0 installation only)
--
-- -----------------------------------------
--- Copyright (c) 2018 Icinga Development Team (https://icinga.com/)
+-- Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+
--
-- Please check https://docs.icinga.com for upgrading information!
-- -----------------------------------------
diff --git a/plugins/README.md b/plugins/README.md
deleted file mode 100644
index 0a34bffd8..000000000
--- a/plugins/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## Icinga 2 plugins for Windows
-
-This collection of plugins is intended to provide basic functionality checks on windows machines.
-They (mostly) conform to the [nagios developer guidelines](https://nagios-plugins.org/doc/guidelines.html),
-returning adequate exit codes and printing a pertinent string with performance data.
-
-
-### Intallation
-
-The plugins are installed as part of Icinga 2.
-
-
-### Requirements
-
-- Boost 1.41.0
-- Windows Vista, Windows Server 2008 or newer
-
-
-### Usage
-
-Call a plugin with the "--help" option to receive information about its usage.
-Most of them don't need any parameters to but all of them have a -w (warning) and -c (critical) option.
-Those accept, if not otherwise specified, value or percentage based thresholds or threshold ranges.
-
-A few examples:
-*./check_command.exe -w 12 -c !60%*
-Adds a warning threshold of 12 and an inversed critical threshold of 60%
-
-*./check_command.exe -w ![20%-80%] -c [0%-40%]*
-The warning threshold is outside of 20% to 80% and the critical threshold is the range from 0% to 40%.
-A critical state always overwrites a warning state, meaning the check would be critical with a value of 30%.
-
-
-### License
-
-Icinga 2
-Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/)
-
-This program is free software; you can redistribute it and/or
-modify it under the tems of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/tools/debug/natvis/extension.vsixmanifest b/tools/debug/natvis/extension.vsixmanifest
index 4b8c6fcea..d870e89b1 100644
--- a/tools/debug/natvis/extension.vsixmanifest
+++ b/tools/debug/natvis/extension.vsixmanifest
@@ -1,6 +1,6 @@
-
+
Icinga 2 Debugger Visualizers for Visual Studio
Icinga 2 Debugger Visualizers