Skip to content

Commit b7caf08

Browse files
author
Michael Friedrich
committed
Ensure that *.icinga.com is used everywhere
fixes #13897 fixes #13277
1 parent d2e2e61 commit b7caf08

File tree

778 files changed

+973
-971
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

778 files changed

+973
-971
lines changed

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Markus Waldmüller <markus.waldmueller@netways.de>
1212
Claudio Kuenzler <ck@claudiokuenzler.com>
1313
<markus.frosch@icinga.com> <markus@lazyfrosch.de>
1414
<markus.frosch@icinga.com> <lazyfrosch@icinga.org>
15+
<bernd.erk@icinga.com> <bernd.erk@icinga.org>
1516
<thomas.widhalm@icinga.com> <thomas.widhalm@netways.de>
1617
<thomas.widhalm@icinga.com> <widhalmt@widhalmt.or.at>
1718
<assaf@aikilinux.com> <assaf.flatto@livepopuli.com>

‎AUTHORS

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Arnd Hannemann <arnd@arndnet.de>
99
Assaf Flatto <assaf@aikilinux.com>
1010
Bastian Guse <bguse@nocopy.de>
1111
Benedikt Heine <bebe@bebehei.de>
12-
Bernd Erk <bernd.erk@icinga.org>
12+
Bernd Erk <bernd.erk@icinga.com>
1313
Berthold Cogel <cogel@uni-koeln.de>
1414
Blerim Sheqa <blerim.sheqa@icinga.com>
1515
Brendan Jurd <direvus@gmail.com>

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Icinga 2
2-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
2+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
33
#
44
# This program is free software; you can redistribute it and/or
55
# modify it under the terms of the GNU General Public License

‎ChangeLog

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Please check [doc/1-about.md].
99
#### Changes
1010

1111
* Client/Satellite setup
12-
* The "bottom up" client configuration mode has been deprecated. Check [#13255](https://dev.icinga.org/issues/13255) for additional details and migration.
12+
* The "bottom up" client configuration mode has been deprecated. Check [#13255](https://dev.icinga.com/issues/13255) for additional details and migration.
1313
* Linux/Unix daemon
1414
* Ensure that Icinga 2 does not leak file descriptors to executed commands.
1515
* There are 2 processes started instead of previously just one process.
@@ -50,7 +50,7 @@ Please check [doc/1-about.md].
5050
* Feature 13327 (Documentation): Update API and Library Reference chapters
5151
* Feature 13319 (Documentation): Add a note about pinning checks w/ command_endpoint
5252
* Feature 13297 (Documentation): Add a note about default template import to the CheckCommand object
53-
* Feature 13199 (Documentation): Doc: Swap packages.icinga.org w/ DebMon
53+
* Feature 13199 (Documentation): Doc: Swap packages.icinga.com w/ DebMon
5454
* Feature 12834 (Documentation): Add more Timeperiod examples in the documentation
5555
* Feature 12832 (Documentation): Add an example of multi-parents configuration for the Migration chapter
5656
* 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
16871687
* Bug #8192: Feature statusdata shows wrong host notification options
16881688
* Bug #8201: Update Icinga Web 2 uri to /icingaweb2
16891689
* Bug #8214: Fix YAJL detection on Debian squeeze
1690-
* Bug #8222: inconsistent URL http(s)://www.icinga.org
1690+
* Bug #8222: inconsistent URL http(s)://www.icinga.com
16911691
* Bug #8223: Typos in readme file for windows plugins
16921692
* Bug #8245: check_ssmtp command does NOT support mail_from
16931693
* 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
21442144
* DB IDO - Bug #6577: icinga2-ido-pgsql snapshot package missing dependecy dbconfig-common
21452145
* Documentation - Bug #6506: Array section confusing
21462146
* Documentation - Bug #6592: Documentation for || and && is missing
2147-
* Documentation - Feature #6658: change docs.icinga.org/icinga2/latest to git master
2147+
* Documentation - Feature #6658: change docs.icinga.com/icinga2/latest to git master
21482148
* Livestatus - Bug #6494: Thruk Panorama View cannot query Host Status
21492149
* Livestatus - Feature #5312: OutputFormat python
21502150
* Migration - Bug #6559: $SERVICEDESC$ isn't getting converted correctly

‎NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
News for this application can be found on the project website at https://www.icinga.org
1+
News for this application can be found on the project website at https://www.icinga.com

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Icinga 2
22

3-
![Icinga Logo](https://www.icinga.org/wp-content/uploads/2014/06/icinga_logo.png)
3+
![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png)
44

55
#### Table of Contents
66

@@ -70,7 +70,7 @@ Basic unit test coverage is provided by running `make test` during package build
7070
Read the [INSTALL.md](INSTALL.md) file for more information about development builds.
7171

7272
Snapshot packages from the laster development branch are available inside the
73-
[package repository](http://packages.icinga.org).
73+
[package repository](http://packages.icinga.com).
7474

7575
You can help test-drive the latest Icinga 2 snapshot packages inside the
7676
[Icinga 2 Vagrant boxes](https://github.com/icinga/icinga-vagrant).

‎RELEASE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ into master and merge the support branch:
118118

119119
* Test DB IDO with MySQL and PostgreSQL.
120120
* Provision the vagrant boxes and test the release packages.
121-
* Test the [setup wizard](http://packages.icinga.org/windows/) inside a Windows VM.
121+
* Test the [setup wizard](http://packages.icinga.com/windows/) inside a Windows VM.
122122

123123
* Start a new docker container and install/run icinga2.
124124

125125
Example for CentOS7:
126126

127127
$ docker run -ti centos:latest bash
128128

129-
# yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
129+
# yum -y install http://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
130130
# yum -y install icinga2
131131
# icinga2 daemon -C
132132

‎agent/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Icinga 2
2-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
2+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
33
#
44
# This program is free software; you can redistribute it and/or
55
# modify it under the terms of the GNU General Public License

‎changelog.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# Icinga 2
3-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
3+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
2121

2222
DESCRIPTION="update release changes"
2323
VERSION="1.0.0"
24-
ISSUE_URL= "https://dev.icinga.org/issues/"
24+
ISSUE_URL= "https://dev.icinga.com/issues/"
2525
ISSUE_PROJECT="i2"
2626

2727
arg_parser = ArgumentParser(description= "%s (Version: %s)" % (DESCRIPTION, VERSION))
@@ -76,7 +76,7 @@ def print_category(category, entries):
7676
if args.project:
7777
ISSUE_PROJECT=args.project
7878

79-
rsp = urllib2.urlopen("https://dev.icinga.org/projects/%s/versions.json" % (ISSUE_PROJECT))
79+
rsp = urllib2.urlopen("https://dev.icinga.com/projects/%s/versions.json" % (ISSUE_PROJECT))
8080
versions_data = json.loads(rsp.read())
8181

8282
version_id = None
@@ -119,7 +119,7 @@ def print_category(category, entries):
119119
while True:
120120
# We could filter using &cf_13=1, however this doesn't currently work because the custom field isn't set
121121
# for some of the older tickets:
122-
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))
122+
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))
123123
issues_data = json.loads(rsp.read())
124124
issues_count = len(issues_data["issues"])
125125
offset = offset + issues_count

‎choco/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Icinga 2
2-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
2+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
33
#
44
# This program is free software; you can redistribute it and/or
55
# modify it under the terms of the GNU General Public License

‎choco/chocolateyInstall.ps1.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$packageName = 'icinga2'
22
$installerType = 'msi'
3-
$url32 = 'https://packages.icinga.org/windows/Icinga2-v${SPEC_VERSION}-x86.msi'
4-
$url64 = 'https://packages.icinga.org/windows/Icinga2-v${SPEC_VERSION}-x86_64.msi'
3+
$url32 = 'https://packages.icinga.com/windows/Icinga2-v${SPEC_VERSION}-x86.msi'
4+
$url64 = 'https://packages.icinga.com/windows/Icinga2-v${SPEC_VERSION}-x86_64.msi'
55
$silentArgs = '/qn /norestart'
66
$validExitCodes = @(0)
77

‎choco/icinga2.nuspec.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<owners>Icinga Development Team</owners>
1212
<summary>icinga2 - Monitoring Agent for Windows</summary>
1313
<description>Icinga 2 is an open source monitoring platform which notifies users about host and service outages.</description>
14-
<projectUrl>https://www.icinga.org/</projectUrl>
14+
<projectUrl>https://www.icinga.com/</projectUrl>
1515
<tags>icinga2 agent monitoring</tags>
16-
<licenseUrl>https://www.icinga.org/resources/faq/</licenseUrl>
16+
<licenseUrl>https://www.icinga.com/resources/faq/</licenseUrl>
1717
<requireLicenseAcceptance>false</requireLicenseAcceptance>
18-
<iconUrl>https://www.icinga.org/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
18+
<iconUrl>https://www.icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png</iconUrl>
1919
</metadata>
2020
<files>
2121
<file src="${CMAKE_CURRENT_BINARY_DIR}/chocolateyInstall.ps1" target="tools" />

‎cmake/InstallConfig.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Icinga 2
2-
# Copyright (C) 2012-2016 Icinga Development Team (http://www.icinga.org)
2+
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.com)
33
#
44
# This program is free software; you can redistribute it and/or
55
# modify it under the terms of the GNU General Public License

‎contrib/GPLHeader

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
* Icinga 2 *
3-
* Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/) *
3+
* Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/) *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎contrib/discover-api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# Icinga 2
3-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
3+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License

‎contrib/discover.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# Icinga 2
3-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
3+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License

‎contrib/icinga2clr.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/******************************************************************************
22
* Icinga 2 *
3-
* Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/) *
3+
* Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/) *
44
* *
55
* This program is free software; you can redistribute it and/or *
66
* modify it under the terms of the GNU General Public License *

‎contrib/make-agent-config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# Icinga 2
3-
# Copyright (C) 2012-2016 Icinga Development Team (https://www.icinga.org/)
3+
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
44
#
55
# This program is free software; you can redistribute it and/or
66
# modify it under the terms of the GNU General Public License

0 commit comments

Comments
 (0)