tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

various: change icinga.org to icinga.com 

fixes #14001
This commit is contained in:
Thomas Gelf 2017-01-13 13:33:58 +01:00
parent 0d6209c257
commit 4a75804d86
7 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/KickstartForm.php
View File

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

2
application/locale/de_DE/LC_MESSAGES/director.po
View File

@ -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 <thomas@gelf.net>\n"

2
contrib/windows-agent-installer/Icinga2Agent.psm1
View File

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

2
doc/91-Want-more.md
View File

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

12
doc/93-Testing.md
View File

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

8
library/Director/Data/Db/DbObject.php
View File

@ -1,11 +1,5 @@
<?php
/**
* This file ...
*
* @copyright Icinga Team <team@icinga.org>
* @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);
}
}
}

2
library/Director/IcingaConfig/IcingaConfigHelper.php
View File

@ -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',