From 4a75804d8660900716ed94704a83dfb86a72e214 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Fri, 13 Jan 2017 13:33:58 +0100 Subject: [PATCH] various: change icinga.org to icinga.com fixes #14001 --- application/forms/KickstartForm.php | 2 +- application/locale/de_DE/LC_MESSAGES/director.po | 2 +- contrib/windows-agent-installer/Icinga2Agent.psm1 | 2 +- doc/91-Want-more.md | 2 +- doc/93-Testing.md | 12 ++++++------ library/Director/Data/Db/DbObject.php | 8 +------- library/Director/IcingaConfig/IcingaConfigHelper.php | 2 +- 7 files changed, 12 insertions(+), 18 deletions(-) diff --git a/application/forms/KickstartForm.php b/application/forms/KickstartForm.php index f2fb38b8..eef6c27e 100644 --- a/application/forms/KickstartForm.php +++ b/application/forms/KickstartForm.php @@ -87,7 +87,7 @@ class KickstartForm extends QuickForm . ' up the connection to your Icinga 2 server.' ), array('name' => 'HINT_kickstart') - // http://docs.icinga.org/icinga2/latest/doc/module/icinga2/chapter/object-types#objecttype-apilistener + // http://docs.icinga.com/icinga2/latest/doc/module/icinga2/chapter/object-types#objecttype-apilistener ); $this->addElement('text', 'endpoint', array( diff --git a/application/locale/de_DE/LC_MESSAGES/director.po b/application/locale/de_DE/LC_MESSAGES/director.po index ae2344ea..af687a5c 100644 --- a/application/locale/de_DE/LC_MESSAGES/director.po +++ b/application/locale/de_DE/LC_MESSAGES/director.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Director Module (1.3.0)\n" -"Report-Msgid-Bugs-To: dev@icinga.org\n" +"Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2017-01-12 21:54+0100\n" "PO-Revision-Date: 2017-01-13 12:55+0100\n" "Last-Translator: Thomas Gelf \n" diff --git a/contrib/windows-agent-installer/Icinga2Agent.psm1 b/contrib/windows-agent-installer/Icinga2Agent.psm1 index 1cfe17d1..d0014ceb 100644 --- a/contrib/windows-agent-installer/Icinga2Agent.psm1 +++ b/contrib/windows-agent-installer/Icinga2Agent.psm1 @@ -15,7 +15,7 @@ function Icinga2AgentModule { [array]$ParentEndpoints, # Agent installation / update - [string]$DownloadUrl = 'https://packages.icinga.org/windows/', + [string]$DownloadUrl = 'https://packages.icinga.com/windows/', [bool]$AllowUpdates = $FALSE, [array]$InstallerHashes, [bool]$FlushApiDirectory = $FALSE, diff --git a/doc/91-Want-more.md b/doc/91-Want-more.md index 0d287290..2b70cd6a 100644 --- a/doc/91-Want-more.md +++ b/doc/91-Want-more.md @@ -13,7 +13,7 @@ case you miss a feature or have a cool idea of what else we could add please let us know. Just file an issue or a feature request to our issue tracker: - https://dev.icinga.org + https://dev.icinga.com/projects/icingaweb2-module-director/issues The Icinga project is and remains Open Source Software and lives from community ideas and contributions. diff --git a/doc/93-Testing.md b/doc/93-Testing.md index 76381b99..7d2f8fb9 100644 --- a/doc/93-Testing.md +++ b/doc/93-Testing.md @@ -175,7 +175,7 @@ sed -i'' 's/repo_gpgcheck=1/repo_gpgcheck=0/' /etc/yum.repos.d/runner_gitlab-ci- # Package installation yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -yum install -y https://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm +yum install -y https://packages.icinga.com/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm yum install -y php-Icinga icingaweb2-common phpunit mariadb-server postgresql-server \ postgresql-contrib gitlab-ci-multi-runner @@ -217,7 +217,7 @@ curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi- # Package installation yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm -yum install -y https://packages.icinga.org/epel/6/release/noarch/icinga-rpm-release-6-1.el6.noarch.rpm +yum install -y https://packages.icinga.com/epel/6/release/noarch/icinga-rpm-release-6-1.el6.noarch.rpm yum install -y php-Icinga icingaweb2-common phpunit mysql-server gitlab-ci-multi-runner # Start and enable MySQL @@ -240,8 +240,8 @@ gitlab-ci-multi-runner register -n \ # Package installation apt-get update -q -q apt-get install -y -q wget curl -wget -q -O - http://packages.icinga.org/icinga.key | apt-key add - -echo 'deb http://packages.icinga.org/debian icinga-jessie main' > /etc/apt/sources.list.d/icinga.list +wget -q -O - http://packages.icinga.com/icinga.key | apt-key add - +echo 'deb http://packages.icinga.com/debian icinga-jessie main' > /etc/apt/sources.list.d/icinga.list curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh | bash apt-get update -q -q DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \ @@ -266,8 +266,8 @@ gitlab-ci-multi-runner register -n \ # Package installation apt-get update -q -q apt-get install -y -q wget curl -wget -q -O - http://packages.icinga.org/icinga.key | apt-key add - -echo 'deb http://packages.icinga.org/ubuntu icinga-xenial main' > /etc/apt/sources.list.d/icinga.list +wget -q -O - http://packages.icinga.com/icinga.key | apt-key add - +echo 'deb http://packages.icinga.com/ubuntu icinga-xenial main' > /etc/apt/sources.list.d/icinga.list curl -L https://packages.gitlab.com/install/repositories/runner/gitlab-ci-multi-runner/script.deb.sh | bash apt-get update -q -q DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -q -y \ diff --git a/library/Director/Data/Db/DbObject.php b/library/Director/Data/Db/DbObject.php index 72d014ac..11b71822 100644 --- a/library/Director/Data/Db/DbObject.php +++ b/library/Director/Data/Db/DbObject.php @@ -1,11 +1,5 @@ - * @license GPLv2 http://www.gnu.org/licenses/gpl-2.0.html - */ namespace Icinga\Module\Director\Data\Db; use Icinga\Exception\IcingaException as IE; @@ -1148,4 +1142,4 @@ abstract class DbObject unset($this->db); unset($this->connection); } -} \ No newline at end of file +} diff --git a/library/Director/IcingaConfig/IcingaConfigHelper.php b/library/Director/IcingaConfig/IcingaConfigHelper.php index d05ba65c..1c219e83 100644 --- a/library/Director/IcingaConfig/IcingaConfigHelper.php +++ b/library/Director/IcingaConfig/IcingaConfigHelper.php @@ -8,7 +8,7 @@ class IcingaConfigHelper { /** * Reserved words according to - * http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/language-reference#reserved-keywords + * https://docs.icinga.com/icinga2/snapshot/doc/module/icinga2/chapter/language-reference#reserved-keywords */ protected static $reservedWords = array( 'object',