Replace a few more copyright strings

diff --git a/CMakeLists.txt b/CMakeLists.txt
index be16dae79f05963af9df4942a65c345ba524a493..3556d3a9672c58bf2462ceecb1cca9bd707e9827 100644 (file)
--- 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 34d61840cc887ee74a4f9170cd47f09c2eb4e7a6..d390a87ec7ad3ff816f9a371abd7edbb409e13f9 100644 (file)
--- 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 59af944f43b834fe29552108984665810c4c958c..1b1465df6c8cc5425535d9e41d4115f9e5bc86d5 100755 (executable)
--- a/choco/icinga2.nuspec.cmake
+++ b/choco/icinga2.nuspec.cmake
@@ -7,8 +7,8 @@
     <id>icinga2</id>\r
     <title>Icinga 2</title>\r
     <version>${SPEC_VERSION}</version>\r
-    <authors>The Icinga Project</authors>\r
-    <owners>Icinga Development Team</owners>\r
+    <authors>Icinga GmbH</authors>\r
+    <owners>Icinga GmbH</owners>\r
     <summary>icinga2 - Monitoring Agent for Windows</summary>\r
     <description>Icinga 2 is an open source monitoring platform which notifies users about host and service outages.</description>\r
     <projectUrl>https://icinga.com/</projectUrl>\r

diff --git a/cmake/InstallConfig.cmake b/cmake/InstallConfig.cmake
index 3f24b39d025358e3d7287a9a5af9493f37be5be0..70eae91e692a7a91b5bfadacb2088b5bfc61ffb8 100644 (file)
--- 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 3e9e2236a9bb10f1014e4b59c6ea702d368af67e..8dce669af84fe0eab5837390ab566779eb4846df 100644 (file)
--- 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 3fd58b1064ea6981b2c509338b0d894b576fe419..9b2cfd1a28d0a5c3641628ec840ee67bfa1fee44 100644 (file)
--- 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 ca177eefdee5dbe1a7f1085ef8ec7e8861c56b40..e229f3f72d338f11c1d5ba533ac578354644f24e 100644 (file)
--- a/doc/icinga2.8
+++ b/doc/icinga2.8
@@ -92,7 +92,7 @@ Report bugs at <https://github.com/Icinga/icinga2>
 .br
 Icinga home page: <https://icinga.com/>
 .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 <http://gnu.org/licenses/gpl2.html>
 .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 e569b0d84069a24a1ee00d1eb8fc25fb904c689c..765d4a04fbd03d70a15f2dde69fd231db914f2a2 100755 (executable)
--- 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 958e2d639d6de2f43b6ccfb9f91853aa4a6f813b..9755bd1698427fe56bb3e51f141ccf53da4bcc59 100755 (executable)
--- 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 55edf4876d851e55fdc16ea2e7a16bed7afb6354..8e113103d3d90eca50c19b7b3906d440b6206497 100755 (executable)
--- 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 9294f989bc0ce468f040a0621ff7f8411d4569b9..dbd317be6f7407e60cad3694ea499803eabb5c99 100644 (file)
--- 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 268bb9b953aeaa077172aa8054d1fd185e1ef9be..233f90cab31b7862c9a95781372c1b590826dc51 100644 (file)
--- 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 934678688823556b56245f5813bdbea0faf0494b..0c462558d82cce3f21736458c8461d8f2f9f7b3a 100644 (file)
--- 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 5fae7aabc06237baaee3ac364306ba3686ccceff..71f1b96c7186b2c83e15427ee28cf6080befeb30 100644 (file)
--- 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 bad5796bd712ef94ac6c5daac517b964e9d9f8d5..4e0d536cc90e7182d7460e1545c0afec01e29cd0 100644 (file)
--- 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 6fec218c5fecec8af96acb1a835c97508eb92682..bf0461fba9dfb31df6592c70320318f5bbaa1933 100644 (file)
--- 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 968e1d69486c3cffc8904b6ba3f9959891016083..c622ae9a62ea8a2e1f9c35f55ae81f2ff8f8d611 100644 (file)
--- 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 e386da421b1d092df64621d03afc79b3a45f4afa..7bbed721b634df8334a9bb6cba803a720e3790d8 100644 (file)
--- 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 c0462e866d47148f4527d0b21f96810f08dffd4a..22a6115317793510979c944a6ea7f5f33ec58657 100644 (file)
--- 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 27d37ff04d20de9d28ef249636f7139f4eac2839..f2fe463b1bfaf9bba392594ee08fbef1e9f15f21 100644 (file)
--- 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 28e8ad27df244664c7eec87f34a9967a1533a4b9..f6803f715a6aebb950de46e0261b6bc3bb51f034 100644 (file)
--- 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 cd7aabb48a053074641d7b02e63bc9d731515706..d5714a0cbc137ade8fbf8f0f17486bfa7458841f 100644 (file)
--- 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 672f8c9b839a6188f84b3fae64d9a49125cd8ea9..33dd780b32aef2c27907c84900776706751bbf0a 100644 (file)
--- 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 680f1b5c4cb5ded0ac760775a32600fe93c31f57..8d511a757e8e1665d5c47073262f91de443cde99 100644 (file)
--- 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 0c558f77d2d55edfd5cdc63690ce69381b970b38..98f851143dd22126faea3519cf6efcb65bb3e25f 100644 (file)
--- 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 46697ee8c60f9a11e12f3c0c72d953400f35e9ed..242b6db5cf2242ead79d6db1800ce4c6119dbeb4 100644 (file)
--- 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 6c6fd2126917d70bdb420d098db7d0e693851db2..60710efd3f94f2a325e0d0d872f87004ecec57d0 100644 (file)
--- 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 6c5acfdcec9ea7c0c61da548f0fb58993c84cecb..a32ecea511e75854e825ebc808754f5c91ab8a73 100644 (file)
--- 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 e3af07a3b53a52780a6ae7f0b3eec3a41b8d6275..d105a34beffdbf8a5d6ab919b513450ba1d663b3 100644 (file)
--- 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 aa693f2739f9bb1e9a232d4d56b640435db12dd5..91764de64f85f5910f188bf18573fdd19db7c8be 100644 (file)
--- 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 e4b3e16c843b5ae4d97c659cccbec86c47e6361d..4a6e45eb9d9ca96469446522dcf7eb70ec783e2e 100644 (file)
--- 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 db7cc246b18a636670f217691586e99fc2211b9a..063a812d6266756e26cdad5d01ed5be92357ecca 100644 (file)
--- 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 f7c3a709e3f21bb5428fa231dae481707d4aa272..aa538a62d27fda682eceecb2d483ffc6bf969878 100644 (file)
--- 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 e11ba03ce729a8fa2be2d102da038fb5fdc280e5..31ab3246bc62d66a081d009a29d65cf9cd01d32d 100644 (file)
--- 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 ebff8fc9cd07047616da160670760ebeb3fddd17..05202c03dc45e1eff02c44ab4cde5c543f7e518f 100644 (file)
--- 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 (file)
index 0a34bff..0000000
--- 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 4b8c6fceaa7da1d443277199d2ca2fe1abe2ae71..d870e89b19700b9151b0ce7e3edf9e4f0519c8b5 100644 (file)
--- a/tools/debug/natvis/extension.vsixmanifest
+++ b/tools/debug/natvis/extension.vsixmanifest
@@ -1,6 +1,6 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011">
   <Metadata>
-    <Identity Id="Icinga2Visualizers.VS2013.D1DFF2F5-FB30-41FE-8EEF-0CEB97ABBC6B" Version="2.0.0" Language="en-US" Publisher="Icinga Development Team" />
+    <Identity Id="Icinga2Visualizers.VS2013.D1DFF2F5-FB30-41FE-8EEF-0CEB97ABBC6B" Version="2.0.0" Language="en-US" Publisher="Icinga GmbH" />
     <DisplayName>Icinga 2 Debugger Visualizers for Visual Studio</DisplayName>
     <Description xml:space="preserve">Icinga 2 Debugger Visualizers</Description>
   </Metadata>