From 08a82daea31d853dd3d7704577b168612296def9 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 12 Jan 2017 12:28:40 +0100 Subject: [PATCH 1/3] Update to icinga.com refs #2687 --- .../modules/icinga_packages/manifests/init.pp | 4 +- README.md | 4 +- RELEASE.md | 4 +- Vagrantfile | 2 +- .../ApplicationStateController.php | 2 +- application/controllers/IndexController.php | 2 +- application/controllers/RoleController.php | 2 +- .../forms/Navigation/NavigationConfigForm.php | 2 +- .../locale/ar_SA/LC_MESSAGES/icinga.po | 2 +- .../locale/de_DE/LC_MESSAGES/icinga.po | 2 +- .../locale/fi_FI/LC_MESSAGES/icinga.po | 2 +- .../locale/pt_BR/LC_MESSAGES/icinga.po | 2 +- application/views/scripts/about/index.phtml | 10 ++--- .../views/scripts/authentication/login.phtml | 4 +- changelog.py | 8 ++-- doc/02-Installation.md | 40 +++++++++---------- doc/90-SELinux.md | 2 +- icingaweb2.spec | 4 +- library/Icinga/Authentication/Auth.php | 2 +- library/Icinga/Protocol/Ldap/LdapUtils.php | 4 +- library/Icinga/Protocol/Ldap/Node.php | 4 +- library/Icinga/Protocol/Ldap/Root.php | 4 +- .../Icinga/Protocol/Livestatus/Connection.php | 4 +- .../Web/Controller/ControllerTabCollector.php | 2 +- library/Icinga/Web/Widget.php | 4 +- library/Icinga/Web/Widget/AbstractWidget.php | 4 +- library/vendor/Zend/README.md | 2 +- .../locale/ar_SA/LC_MESSAGES/monitoring.po | 2 +- .../locale/de_DE/LC_MESSAGES/monitoring.po | 2 +- .../locale/it_IT/LC_MESSAGES/monitoring.po | 2 +- .../locale/pt_BR/LC_MESSAGES/monitoring.po | 2 +- .../Monitoring/Object/MonitoredObject.php | 2 +- .../test/php/regression/Bug11728Test.php | 2 +- .../test/php/regression/Bug11796Test.php | 2 +- .../test/php/regression/Bug6088Test.php | 2 +- .../locale/de_DE/LC_MESSAGES/setup.po | 2 +- .../locale/it_IT/LC_MESSAGES/setup.po | 2 +- .../views/scripts/form/setup-welcome.phtml | 2 +- modules/translation/doc/translation.md | 2 +- .../Util/GettextTranslationHelper.php | 2 +- packages/RPM.md | 2 +- packages/debian/control | 4 +- .../js/icinga/behavior/application-state.js | 2 +- .../Data/DataArray/ArrayDatasourceTest.php | 4 +- .../library/Icinga/Data/Filter/FilterTest.php | 8 ++-- test/php/regression/Bug11831Test.php | 2 +- test/php/regression/Bug4102Test.php | 2 +- test/php/regression/Bug6284Test.php | 2 +- test/php/regression/Bug6432Test.php | 2 +- .../locale/de_DE/LC_MESSAGES/icingatest.po | 2 +- 50 files changed, 92 insertions(+), 92 deletions(-) diff --git a/.puppet/modules/icinga_packages/manifests/init.pp b/.puppet/modules/icinga_packages/manifests/init.pp index b6e46960a..a63d5052b 100644 --- a/.puppet/modules/icinga_packages/manifests/init.pp +++ b/.puppet/modules/icinga_packages/manifests/init.pp @@ -8,10 +8,10 @@ # class icinga_packages { yumrepo { 'icinga_packages': - baseurl => "http://packages.icinga.org/epel/${::operatingsystemmajrelease}/snapshot/", + baseurl => "http://packages.icinga.com/epel/${::operatingsystemmajrelease}/snapshot/", enabled => '1', gpgcheck => '1', - gpgkey => 'http://packages.icinga.org/icinga.key', + gpgkey => 'http://packages.icinga.com/icinga.key', descr => "Icinga Repository - ${::architecture}" } } diff --git a/README.md b/README.md index addeedaf1..479912ca8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Icinga Web 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) 1. [About](#about) 2. [License](#license) @@ -12,7 +12,7 @@ ## About **Icinga Web 2** is the next generation open source monitoring web interface, framework -and command-line interface developed by the [Icinga Project](https://www.icinga.org/), supporting Icinga 2, +and command-line interface developed by the [Icinga Project](https://www.icinga.com/), supporting Icinga 2, Icinga Core and any other monitoring backend compatible with the IDO database. ![Icinga Web 2](https://www.icinga.com/wp-content/uploads/2016/12/Icinga-Web-2-v2.4.0.png "Icinga Web 2") diff --git a/RELEASE.md b/RELEASE.md index da70d5bef..6d490642c 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,7 +1,7 @@ # Quality Assurance Review and test the changes and issues for this version. -https://dev.icinga.org/projects/icingaweb2/roadmap +https://dev.icinga.com/projects/icingaweb2/roadmap # Release Workflow @@ -84,6 +84,6 @@ https://github.com/Icinga/icingaweb2/releases ## Announcement -* Create a new blog post on www.icinga.org/blog +* Create a new blog post on www.icinga.com/blog * Send announcement mail to icinga-announce@lists.icinga.org * Social media: [Twitter](https://twitter.com/icinga), [Facebook](https://www.facebook.com/icinga), [G+](http://plus.google.com/+icinga), [Xing](https://www.xing.com/communities/groups/icinga-da4b-1060043), [LinkedIn](https://www.linkedin.com/groups/Icinga-1921830/about) diff --git a/Vagrantfile b/Vagrantfile index b17c2dcc2..318fa2ecb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.provider :virtualbox do |vb, override| override.vm.box = "centos-71-x64-vbox" - override.vm.box_url = "http://boxes.icinga.org/centos-71-x64-vbox.box" + override.vm.box_url = "http://boxes.icinga.com/centos-71-x64-vbox.box" vb.customize ["modifyvm", :id, "--memory", "1024"] vb.customize ["modifyvm", :id, "--cpus", "2"] diff --git a/application/controllers/ApplicationStateController.php b/application/controllers/ApplicationStateController.php index cba019843..18c2b763b 100644 --- a/application/controllers/ApplicationStateController.php +++ b/application/controllers/ApplicationStateController.php @@ -10,7 +10,7 @@ use Icinga\Web\Controller; use Icinga\Web\Session; /** - * @TODO(el): https://dev.icinga.org/issues/10646 + * @TODO(el): https://dev.icinga.com/issues/10646 */ class ApplicationStateController extends Controller { diff --git a/application/controllers/IndexController.php b/application/controllers/IndexController.php index 9dd929c6b..dac178990 100644 --- a/application/controllers/IndexController.php +++ b/application/controllers/IndexController.php @@ -17,7 +17,7 @@ class IndexController extends ActionController public function preDispatch() { if ($this->getRequest()->getActionName() !== 'welcome') { - // @TODO(el): Avoid landing page redirects: https://dev.icinga.org/issues/9656 + // @TODO(el): Avoid landing page redirects: https://dev.icinga.com/issues/9656 $this->redirectNow(Url::fromRequest()->setPath('dashboard')); } } diff --git a/application/controllers/RoleController.php b/application/controllers/RoleController.php index d71b9f27c..b9361f63b 100644 --- a/application/controllers/RoleController.php +++ b/application/controllers/RoleController.php @@ -14,7 +14,7 @@ use Icinga\Web\Notification; /** * Manage user permissions and restrictions based on roles * - * @TODO(el): Rename to RolesController: https://dev.icinga.org/issues/10015 + * @TODO(el): Rename to RolesController: https://dev.icinga.com/issues/10015 */ class RoleController extends AuthBackendController { diff --git a/application/forms/Navigation/NavigationConfigForm.php b/application/forms/Navigation/NavigationConfigForm.php index 9bfc3a02a..8a5d1918e 100644 --- a/application/forms/Navigation/NavigationConfigForm.php +++ b/application/forms/Navigation/NavigationConfigForm.php @@ -562,7 +562,7 @@ class NavigationConfigForm extends ConfigForm $itemType = isset($formData['type']) ? $formData['type'] : key($itemTypes); if ($itemType === null) { throw new ProgrammingError( - 'This should actually not happen. Create a bug report at dev.icinga.org' + 'This should actually not happen. Create a bug report at dev.icinga.com' . ' or remove this assertion if you know what you\'re doing' ); } diff --git a/application/locale/ar_SA/LC_MESSAGES/icinga.po b/application/locale/ar_SA/LC_MESSAGES/icinga.po index 68d0b6a30..44e1e9719 100644 --- a/application/locale/ar_SA/LC_MESSAGES/icinga.po +++ b/application/locale/ar_SA/LC_MESSAGES/icinga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: dev@icinga.org\n" +"Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2016-05-23 20:16+0300\n" "PO-Revision-Date: 2016-06-02 10:02+0300\n" "Last-Translator: Munzir Taha \n" diff --git a/application/locale/de_DE/LC_MESSAGES/icinga.po b/application/locale/de_DE/LC_MESSAGES/icinga.po index 2d489b9e9..8abc0f332 100644 --- a/application/locale/de_DE/LC_MESSAGES/icinga.po +++ b/application/locale/de_DE/LC_MESSAGES/icinga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Icinga Web 2 (None)\n" -"Report-Msgid-Bugs-To: dev@icinga.org\n" +"Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2016-12-12 09:32+0000\n" "PO-Revision-Date: 2016-12-12 10:32+0100\n" "Language: de_DE\n" diff --git a/application/locale/fi_FI/LC_MESSAGES/icinga.po b/application/locale/fi_FI/LC_MESSAGES/icinga.po index db12ccfd3..d85ecd9bb 100644 --- a/application/locale/fi_FI/LC_MESSAGES/icinga.po +++ b/application/locale/fi_FI/LC_MESSAGES/icinga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Icinga Web 2 (None)\n" -"Report-Msgid-Bugs-To: dev@icinga.org\n" +"Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2015-02-11 15:47+0100\n" "PO-Revision-Date: 2015-02-28 01:56+0200\n" "Last-Translator: Mikko Peltokangas \n" diff --git a/application/locale/pt_BR/LC_MESSAGES/icinga.po b/application/locale/pt_BR/LC_MESSAGES/icinga.po index 3f265c99e..fbd9c2fea 100644 --- a/application/locale/pt_BR/LC_MESSAGES/icinga.po +++ b/application/locale/pt_BR/LC_MESSAGES/icinga.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Icinga Web 2 (None)\n" -"Report-Msgid-Bugs-To: dev@icinga.org\n" +"Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2014-12-03 09:11-0200\n" "PO-Revision-Date: 2014-12-03 09:19-0300\n" "Last-Translator: Carlos Cesario \n" diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml index c55d9bce6..09a013e15 100644 --- a/application/views/scripts/about/index.phtml +++ b/application/views/scripts/about/index.phtml @@ -21,7 +21,7 @@ © 2013- qlink( $this->translate('The Icinga Project'), - 'https://www.icinga.org', + 'https://www.icinga.com', null, array( 'target' => '_blank' @@ -62,7 +62,7 @@
qlink( null, - 'https://dev.icinga.org/projects/icingaweb2', + 'https://dev.icinga.com/projects/icingaweb2', null, array( 'target' => '_blank', @@ -72,7 +72,7 @@ ) ?> qlink( null, - 'https://www.icinga.org/services/support', + 'https://www.icinga.com/services/support', null, array( 'target' => '_blank', @@ -82,7 +82,7 @@ ) ?> qlink( null, - 'https://wiki.icinga.org', + 'https://wiki.icinga.com', null, array( 'target' => '_blank', @@ -92,7 +92,7 @@ ) ?> qlink( null, - 'https://docs.icinga.org/', + 'https://docs.icinga.com/', null, array( 'target' => '_blank', diff --git a/application/views/scripts/authentication/login.phtml b/application/views/scripts/authentication/login.phtml index 0e11fa3b6..faa55c698 100644 --- a/application/views/scripts/authentication/login.phtml +++ b/application/views/scripts/authentication/login.phtml @@ -15,7 +15,7 @@ . 'authentication method. Please define a authentication method by following the instructions in the' . ' %1$sdocumentation%3$s or by using our %2$sweb-based setup-wizard%3$s.' ), - '', // TODO: More exact documentation link + '', // TODO: More exact documentation link '', '' ) ?>

@@ -23,7 +23,7 @@ form ?>

translate('Please see the %s for an extensive description on how to access and use this wizard.'), - '' . $this->translate('Icinga Web 2 documentation') . '' // TODO: Add link to iw2 docs which points to the installation topic + '' . $this->translate('Icinga Web 2 documentation') . '' // TODO: Add link to iw2 docs which points to the installation topic ); ?>

diff --git a/modules/translation/doc/translation.md b/modules/translation/doc/translation.md index fc2fbd841..238c53899 100644 --- a/modules/translation/doc/translation.md +++ b/modules/translation/doc/translation.md @@ -171,7 +171,7 @@ Now you can open the __yourmodule.po__ and you will see something similar: msgid "" msgstr "" "Project-Id-Version: Development Module (0.0.1)\n" - "Report-Msgid-Bugs-To: dev@icinga.org\n" + "Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2014-09-09 10:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" diff --git a/modules/translation/library/Translation/Util/GettextTranslationHelper.php b/modules/translation/library/Translation/Util/GettextTranslationHelper.php index 2178ca371..6d01bf04d 100644 --- a/modules/translation/library/Translation/Util/GettextTranslationHelper.php +++ b/modules/translation/library/Translation/Util/GettextTranslationHelper.php @@ -319,7 +319,7 @@ class GettextTranslationHelper 'author_year' => 'YEAR', 'project_name' => $this->moduleName ? ucfirst($this->moduleName) . ' Module' : 'Icinga Web 2', 'project_version' => $this->version, - 'project_bug_mail' => 'dev@icinga.org', + 'project_bug_mail' => 'dev@icinga.com', 'pot_creation_date' => date('Y-m-d H:iO'), 'po_revision_date' => 'YEAR-MO-DA HO:MI+ZONE', 'translator_name' => 'FULL NAME', diff --git a/packages/RPM.md b/packages/RPM.md index 7a343bb5d..c93b60170 100644 --- a/packages/RPM.md +++ b/packages/RPM.md @@ -35,7 +35,7 @@ Navigate to `/icingaweb/setup` and follow the on-screen instructions. ## Support -Please use one of the listed support channels at https://support.icinga.org +Please use one of the listed support channels at https://support.icinga.com ## Manual Setup diff --git a/packages/debian/control b/packages/debian/control index 73d0b57a3..abd3ffb6c 100644 --- a/packages/debian/control +++ b/packages/debian/control @@ -1,10 +1,10 @@ Source: icingaweb Section: admin -Maintainer: Icinga Development Team +Maintainer: Icinga Development Team Priority: optional Build-Depends: debhelper (>=9) Standards-Version: 3.9.4 -Homepage: https://www.icinga.org +Homepage: https://www.icinga.com Package: php-icinga Architecture: any diff --git a/public/js/icinga/behavior/application-state.js b/public/js/icinga/behavior/application-state.js index b98f7364a..7cd655b44 100644 --- a/public/js/icinga/behavior/application-state.js +++ b/public/js/icinga/behavior/application-state.js @@ -1,6 +1,6 @@ /*! Icinga Web 2 | (c) 2015 Icinga Development Team | GPLv2+ */ -// @TODO(el): https://dev.icinga.org/issues/10646 +// @TODO(el): https://dev.icinga.com/issues/10646 (function(Icinga, $) { 'use strict'; diff --git a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php index 87b81260c..5ad2b1b09 100644 --- a/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php +++ b/test/php/library/Icinga/Data/DataArray/ArrayDatasourceTest.php @@ -24,14 +24,14 @@ class ArrayDatasourceTest extends BaseTestCase (object) array( 'host' => 'localhost', 'problem' => '1', - 'service' => 'www.icinga.org', + 'service' => 'www.icinga.com', 'state' => '0', 'handled' => '0' ), (object) array( 'host' => 'localhost', 'problem' => '1', - 'service' => 'www.icinga.org', + 'service' => 'www.icinga.com', 'state' => '1', 'handled' => '0' ) diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php index ef64b5a21..1101c9219 100644 --- a/test/php/library/Icinga/Data/Filter/FilterTest.php +++ b/test/php/library/Icinga/Data/Filter/FilterTest.php @@ -75,14 +75,14 @@ class FilterTest extends BaseTestCase (object) array( 'host' => 'localhost', 'problem' => '1', - 'service' => 'www.icinga.org', + 'service' => 'www.icinga.com', 'state' => '0', 'handled' => '0' ), (object) array( 'host' => 'localhost', 'problem' => '1', - 'service' => 'www.icinga.org', + 'service' => 'www.icinga.com', 'state' => '1', 'handled' => '0' ) @@ -138,7 +138,7 @@ class FilterTest extends BaseTestCase public function testWildcardFilterMatchesDot() { $this->assertTrue( - Filter::where('service', 'www*icinga.org')->matches($this->row(1)) + Filter::where('service', 'www*icinga.com')->matches($this->row(1)) ); } @@ -169,7 +169,7 @@ class FilterTest extends BaseTestCase Filter::matchAny( Filter::where('service', 'ping'), Filter::matchAll( - Filter::where('service', 'www.icinga.org'), + Filter::where('service', 'www.icinga.com'), Filter::where('state', '0') ) ) diff --git a/test/php/regression/Bug11831Test.php b/test/php/regression/Bug11831Test.php index 7f15e7c55..eda0e1831 100644 --- a/test/php/regression/Bug11831Test.php +++ b/test/php/regression/Bug11831Test.php @@ -13,7 +13,7 @@ use Icinga\Test\BaseTestCase; * * Empty lines in module.info must be ignored if they're not part of the module's description * - * @see https://dev.icinga.org/issues/11831 + * @see https://dev.icinga.com/issues/11831 */ class Bug11831Test extends BaseTestCase { diff --git a/test/php/regression/Bug4102Test.php b/test/php/regression/Bug4102Test.php index b1d2d5ec7..eeb3cc0f6 100644 --- a/test/php/regression/Bug4102Test.php +++ b/test/php/regression/Bug4102Test.php @@ -10,7 +10,7 @@ use Icinga\Test\BaseTestCase; * * Bogus regression test * - * @see https://dev.icinga.org/issues/4102 + * @see https://dev.icinga.com/issues/4102 */ class Bug4102Test extends BaseTestCase { diff --git a/test/php/regression/Bug6284Test.php b/test/php/regression/Bug6284Test.php index 581321098..e92aa92df 100644 --- a/test/php/regression/Bug6284Test.php +++ b/test/php/regression/Bug6284Test.php @@ -11,7 +11,7 @@ use Icinga\Web\Url; * * href-helper drops URL fragments. * - * @see https://dev.icinga.org/issues/6284 + * @see https://dev.icinga.com/issues/6284 */ class Bug6284Test extends BaseTestCase { diff --git a/test/php/regression/Bug6432Test.php b/test/php/regression/Bug6432Test.php index dfaf9a2da..410bd9d00 100644 --- a/test/php/regression/Bug6432Test.php +++ b/test/php/regression/Bug6432Test.php @@ -11,7 +11,7 @@ use Icinga\Util\Translator; * * Translating strings must not throw an exception even if the given domain is not valid. * - * @see https://dev.icinga.org/issues/6432 + * @see https://dev.icinga.com/issues/6432 */ class Bug6432Test extends BaseTestCase { diff --git a/test/php/res/locale/de_DE/LC_MESSAGES/icingatest.po b/test/php/res/locale/de_DE/LC_MESSAGES/icingatest.po index 3215ac4f7..71cf37221 100644 --- a/test/php/res/locale/de_DE/LC_MESSAGES/icingatest.po +++ b/test/php/res/locale/de_DE/LC_MESSAGES/icingatest.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Icinga Web 2 Test (0.0.1)\n" -"Report-Msgid-Bugs-To: dev@icinga.org\n" +"Report-Msgid-Bugs-To: dev@icinga.com\n" "POT-Creation-Date: 2014-09-16 13:29+0200\n" "PO-Revision-Date: 2014-09-16 16:08+0100\n" "Last-Translator: Alexander Fuhr \n" From 1f7bf97a7e75c0d7c9a761cc4301ca738d1edcbc Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Thu, 12 Jan 2017 16:04:09 +0100 Subject: [PATCH 2/3] Update 'About' (remove wiki, update to Github) refs #2687 --- RELEASE.md | 2 +- application/forms/Navigation/NavigationConfigForm.php | 2 +- application/views/scripts/about/index.phtml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 6d490642c..d41b5bb8b 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,7 +1,7 @@ # Quality Assurance Review and test the changes and issues for this version. -https://dev.icinga.com/projects/icingaweb2/roadmap +https://github.com/icinga/icingaweb2 # Release Workflow diff --git a/application/forms/Navigation/NavigationConfigForm.php b/application/forms/Navigation/NavigationConfigForm.php index 8a5d1918e..5ed059400 100644 --- a/application/forms/Navigation/NavigationConfigForm.php +++ b/application/forms/Navigation/NavigationConfigForm.php @@ -562,7 +562,7 @@ class NavigationConfigForm extends ConfigForm $itemType = isset($formData['type']) ? $formData['type'] : key($itemTypes); if ($itemType === null) { throw new ProgrammingError( - 'This should actually not happen. Create a bug report at dev.icinga.com' + 'This should actually not happen. Create a bug report at https://github.com/icinga/icingaweb2' . ' or remove this assertion if you know what you\'re doing' ); } diff --git a/application/views/scripts/about/index.phtml b/application/views/scripts/about/index.phtml index 09a013e15..80068e628 100644 --- a/application/views/scripts/about/index.phtml +++ b/application/views/scripts/about/index.phtml @@ -62,7 +62,7 @@
qlink( null, - 'https://dev.icinga.com/projects/icingaweb2', + 'https://github.com/icinga/icingaweb2', null, array( 'target' => '_blank', @@ -77,17 +77,17 @@ array( 'target' => '_blank', 'icon' => 'chat-empty', - 'title' => $this->translate('Support / Mailinglists') + 'title' => $this->translate('Support') ) ) ?> qlink( null, - 'https://wiki.icinga.com', + 'https://www.icinga.com/community/get-involved/', null, array( 'target' => '_blank', 'icon' => 'lightbulb', - 'title' => $this->translate('Icinga Wiki') + 'title' => $this->translate('Icinga Community') ) ) ?> qlink( From 07e933883077052882482271aefbb5db88301135 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 18 Jan 2017 13:25:09 +0100 Subject: [PATCH 3/3] Fix filter test matching old icinga.org URLS refs #2687 --- test/php/library/Icinga/Data/Filter/FilterTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/php/library/Icinga/Data/Filter/FilterTest.php b/test/php/library/Icinga/Data/Filter/FilterTest.php index 1101c9219..0063dd1a1 100644 --- a/test/php/library/Icinga/Data/Filter/FilterTest.php +++ b/test/php/library/Icinga/Data/Filter/FilterTest.php @@ -124,7 +124,7 @@ class FilterTest extends BaseTestCase public function testWildcardFilterMatchesEnding() { $this->assertTrue( - Filter::where('service', '*org')->matches($this->row(1)) + Filter::where('service', '*com')->matches($this->row(1)) ); }