Skip to content
Permalink
Browse files

Replace a few more copyright strings

  • Loading branch information...
dnsmichi committed Feb 25, 2019
1 parent 458f997 commit 37b715baf12f397498bb50cc7cccd0ee6929bd1e
Showing with 43 additions and 208 deletions.
  1. +1 −1 CMakeLists.txt
  2. +2 −2 agent/windows-setup-agent/Properties/AssemblyInfo.cs
  3. +2 −2 choco/icinga2.nuspec.cmake
  4. +2 −16 cmake/InstallConfig.cmake
  5. +1 −16 cmake/SetFullDir.cmake
  6. +1 −19 contrib/GPLHeader
  7. +1 −1 doc/icinga2.8
  8. +1 −16 doc/update-links.py
  9. +2 −3 etc/icinga2/scripts/mail-host-notification.sh
  10. +1 −2 etc/icinga2/scripts/mail-service-notification.sh
  11. +3 −3 icinga-app/icinga.rc
  12. +1 −0 icinga-installer/icinga-installer.cpp
  13. +1 −18 lib/cli/troubleshootcommand.cpp
  14. +1 −18 lib/config/config_lexer.ll
  15. +2 −19 lib/config/config_parser.yy
  16. +1 −1 lib/db_ido_mysql/schema/mysql.sql
  17. +1 −1 lib/db_ido_mysql/schema/upgrade/2.0.2.sql
  18. +1 −1 lib/db_ido_mysql/schema/upgrade/2.1.0.sql
  19. +1 −1 lib/db_ido_mysql/schema/upgrade/2.2.0.sql
  20. +1 −1 lib/db_ido_mysql/schema/upgrade/2.3.0.sql
  21. +1 −1 lib/db_ido_mysql/schema/upgrade/2.4.0.sql
  22. +1 −1 lib/db_ido_mysql/schema/upgrade/2.5.0.sql
  23. +1 −1 lib/db_ido_mysql/schema/upgrade/2.6.0.sql
  24. +1 −1 lib/db_ido_mysql/schema/upgrade/2.8.0.sql
  25. +1 −1 lib/db_ido_mysql/schema/upgrade/2.8.1.sql
  26. +1 −1 lib/db_ido_pgsql/schema/pgsql.sql
  27. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.0.2.sql
  28. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.1.0.sql
  29. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.2.0.sql
  30. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.3.0.sql
  31. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.4.0.sql
  32. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.5.0.sql
  33. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.6.0.sql
  34. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.8.0.sql
  35. +1 −1 lib/db_ido_pgsql/schema/upgrade/2.8.1.sql
  36. +0 −51 plugins/README.md
  37. +1 −1 tools/debug/natvis/extension.vsixmanifest
@@ -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")
@@ -8,9 +8,9 @@
[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("")]

@@ -7,8 +7,8 @@
<id>icinga2</id>
<title>Icinga 2</title>
<version>${SPEC_VERSION}</version>
<authors>The Icinga Project</authors>
<owners>Icinga Development Team</owners>
<authors>Icinga GmbH</authors>
<owners>Icinga GmbH</owners>
<summary>icinga2 - Monitoring Agent for Windows</summary>
<description>Icinga 2 is an open source monitoring platform which notifies users about host and service outages.</description>
<projectUrl>https://icinga.com/</projectUrl>
@@ -1,27 +1,13 @@
# 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
# * in case of CPack path with be prefixed with share/skel/
# * 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}")
@@ -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)
@@ -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+
@@ -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.
@@ -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
@@ -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`"
@@ -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`"
@@ -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
END
@@ -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];
@@ -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"
@@ -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"
@@ -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"
@@ -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+
--
-- -- --------------------------------------------------------

@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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+
--
-- --------------------------------------------------------

@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------
@@ -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!
-- -----------------------------------------

0 comments on commit 37b715b

Please sign in to comment.
You can’t perform that action at this time.