Ensure that *.icinga.com is used everywhere

fixes #13897 fixes #13277
gmwubs · Jan 10, 2017 · b7caf08 · b7caf08
1 parent d2e2e61
commit b7caf08
Show file tree

Hide file tree

Showing 778 changed files with 973 additions and 971 deletions.
diff --git a/.mailmap b/.mailmap
@@ -12,6 +12,7 @@ Markus Waldmüller <markus.waldmueller@netways.de>
 Claudio Kuenzler <ck@claudiokuenzler.com>
 <markus.frosch@icinga.com> <markus@lazyfrosch.de>
 <markus.frosch@icinga.com> <lazyfrosch@icinga.org>
+<bernd.erk@icinga.com> <bernd.erk@icinga.org>
 <thomas.widhalm@icinga.com> <thomas.widhalm@netways.de>
 <thomas.widhalm@icinga.com> <widhalmt@widhalmt.or.at>
 <assaf@aikilinux.com> <assaf.flatto@livepopuli.com>

diff --git a/AUTHORS b/AUTHORS
@@ -9,7 +9,7 @@ Arnd Hannemann <arnd@arndnet.de>
 Assaf Flatto <assaf@aikilinux.com>
 Bastian Guse <bguse@nocopy.de>
 Benedikt Heine <bebe@bebehei.de>
-Bernd Erk <bernd.erk@icinga.org>
+Bernd Erk <bernd.erk@icinga.com>
 Berthold Cogel <cogel@uni-koeln.de>
 Blerim Sheqa <blerim.sheqa@icinga.com>
 Brendan Jurd <direvus@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/ChangeLog b/ChangeLog
@@ -9,7 +9,7 @@ Please check [doc/1-about.md].
 #### Changes
 
 * Client/Satellite setup
- * The "bottom up" client configuration mode has been deprecated. Check [#13255](https://dev.icinga.org/issues/13255) for additional details and migration.
+ * The "bottom up" client configuration mode has been deprecated. Check [#13255](https://dev.icinga.com/issues/13255) for additional details and migration.
 * Linux/Unix daemon
  * Ensure that Icinga 2 does not leak file descriptors to executed commands. 
  * There are 2 processes started instead of previously just one process.
@@ -50,7 +50,7 @@ Please check [doc/1-about.md].
 * Feature 13327 (Documentation): Update API and Library Reference chapters
 * Feature 13319 (Documentation): Add a note about pinning checks w/ command_endpoint
 * Feature 13297 (Documentation): Add a note about default template import to the CheckCommand object
-* Feature 13199 (Documentation): Doc: Swap packages.icinga.org w/ DebMon
+* Feature 13199 (Documentation): Doc: Swap packages.icinga.com w/ DebMon
 * Feature 12834 (Documentation): Add more Timeperiod examples in the documentation
 * Feature 12832 (Documentation): Add an example of multi-parents configuration for the Migration chapter
 * Feature 12587 (Documentation): Update service monitoring and distributed docs
@@ -1687,7 +1687,7 @@ Please note that this version fixes the default thresholds for the disk check wh
 * Bug #8192: Feature statusdata shows wrong host notification options
 * Bug #8201: Update Icinga Web 2 uri to /icingaweb2
 * Bug #8214: Fix YAJL detection on Debian squeeze
-* Bug #8222: inconsistent URL http(s)://www.icinga.org
+* Bug #8222: inconsistent URL http(s)://www.icinga.com
 * Bug #8223: Typos in readme file for windows plugins
 * Bug #8245: check_ssmtp command does NOT support mail_from
 * Bug #8256: Restart fails after deleting a Host
@@ -2144,7 +2144,7 @@ Please note that this version fixes the default thresholds for the disk check wh
 * DB IDO - Bug #6577: icinga2-ido-pgsql snapshot package missing dependecy dbconfig-common
 * Documentation - Bug #6506: Array section confusing
 * Documentation - Bug #6592: Documentation for || and && is missing
-* Documentation - Feature #6658: change docs.icinga.org/icinga2/latest to git master
+* Documentation - Feature #6658: change docs.icinga.com/icinga2/latest to git master
 * Livestatus - Bug #6494: Thruk Panorama View cannot query Host Status
 * Livestatus - Feature #5312: OutputFormat python
 * Migration - Bug #6559: $SERVICEDESC$ isn't getting converted correctly

diff --git a/NEWS b/NEWS
@@ -1 +1 @@
-News for this application can be found on the project website at https://www.icinga.org
+News for this application can be found on the project website at https://www.icinga.com
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Icinga 2
 
-![Icinga Logo](https://www.icinga.org/wp-content/uploads/2014/06/icinga_logo.png)
+![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
 
 #### Table of Contents
 
@@ -70,7 +70,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.org).
+[package repository](http://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/RELEASE.md b/RELEASE.md
@@ -118,15 +118,15 @@ 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.org/windows/) inside a Windows VM.
+* Test the [setup wizard](http://packages.icinga.com/windows/) inside a Windows VM.
 
 * Start a new docker container and install/run icinga2.
 
 Example for CentOS7:
 
     $ docker run -ti centos:latest bash
 
-    # yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
+    # yum -y install http://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
     # yum -y install icinga2
     # icinga2 daemon -C
 

diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/changelog.py b/changelog.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 
 DESCRIPTION="update release changes"
 VERSION="1.0.0"
-ISSUE_URL= "https://dev.icinga.org/issues/"
+ISSUE_URL= "https://dev.icinga.com/issues/"
 ISSUE_PROJECT="i2"
 
 arg_parser = ArgumentParser(description= "%s (Version: %s)" % (DESCRIPTION, VERSION))
@@ -76,7 +76,7 @@ def print_category(category, entries):
 if args.project:
     ISSUE_PROJECT=args.project
 
-rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/versions.json" % (ISSUE_PROJECT))
+rsp = urllib2.urlopen("https://dev.icinga.com/projects/%s/versions.json" % (ISSUE_PROJECT))
 versions_data = json.loads(rsp.read())
 
 version_id = None
@@ -119,7 +119,7 @@ def print_category(category, entries):
 while True:
     # We could filter using &cf_13=1, however this doesn't currently work because the custom field isn't set
     # for some of the older tickets:
-    rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (ISSUE_PROJECT, offset, version_id))
+    rsp = urllib2.urlopen("https://dev.icinga.com/projects/%s/issues.json?offset=%d&status_id=closed&fixed_version_id=%d" % (ISSUE_PROJECT, offset, version_id))
     issues_data = json.loads(rsp.read())
     issues_count = len(issues_data["issues"])
     offset = offset + issues_count

diff --git a/choco/CMakeLists.txt b/choco/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/choco/chocolateyInstall.ps1.cmake b/choco/chocolateyInstall.ps1.cmake
@@ -1,7 +1,7 @@
 $packageName = 'icinga2'
 $installerType = 'msi'
-$url32 = 'https://packages.icinga.org/windows/Icinga2-v${SPEC_VERSION}-x86.msi'
-$url64 = 'https://packages.icinga.org/windows/Icinga2-v${SPEC_VERSION}-x86_64.msi'
+$url32 = 'https://packages.icinga.com/windows/Icinga2-v${SPEC_VERSION}-x86.msi'
+$url64 = 'https://packages.icinga.com/windows/Icinga2-v${SPEC_VERSION}-x86_64.msi'
 $silentArgs = '/qn /norestart'
 $validExitCodes = @(0)
 

diff --git a/choco/icinga2.nuspec.cmake b/choco/icinga2.nuspec.cmake
@@ -11,11 +11,11 @@
     <owners>Icinga Development Team</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://www.icinga.org/</projectUrl>
+    <projectUrl>https://www.icinga.com/</projectUrl>
     <tags>icinga2 agent monitoring</tags>
-    <licenseUrl>https://www.icinga.org/resources/faq/</licenseUrl>
+    <licenseUrl>https://www.icinga.com/resources/faq/</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>https://www.icinga.org/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
+    <iconUrl>https://www.icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
   </metadata>
   <files>
     <file src="${CMAKE_CURRENT_BINARY_DIR}/chocolateyInstall.ps1" target="tools" />

diff --git a/cmake/InstallConfig.cmake b/cmake/InstallConfig.cmake
@@ -1,5 +1,5 @@
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (http://www.icinga.org)
+# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.com)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/contrib/GPLHeader b/contrib/GPLHeader
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)  *
+ * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *

diff --git a/contrib/discover-api.py b/contrib/discover-api.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/contrib/discover.py b/contrib/discover.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

diff --git a/contrib/icinga2clr.cs b/contrib/icinga2clr.cs
@@ -1,6 +1,6 @@
 /******************************************************************************
  * Icinga 2                                                                   *
- * Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)  *
+ * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
  *                                                                            *
  * This program is free software; you can redistribute it and/or              *
  * modify it under the terms of the GNU General Public License                *

diff --git a/contrib/make-agent-config.py b/contrib/make-agent-config.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # Icinga 2
-# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
+# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		News for this application can be found on the project website at https://www.icinga.org
		News for this application can be found on the project website at https://www.icinga.com