From 0b4390411c1f4dec31b59ba793093c8c966af8c7 Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Thu, 15 Dec 2016 15:12:19 +0100 Subject: [PATCH 1/9] DbTool: Do not replace '%' with '%%' in method grantPrivileges (cherry picked from commit e9eeb030a6da50a8244f9939d91c2f7c38db676b) Signed-off-by: Eric Lippmann --- modules/setup/library/Setup/Utils/DbTool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/setup/library/Setup/Utils/DbTool.php b/modules/setup/library/Setup/Utils/DbTool.php index 0d0ebfe9e..2b493af69 100644 --- a/modules/setup/library/Setup/Utils/DbTool.php +++ b/modules/setup/library/Setup/Utils/DbTool.php @@ -583,7 +583,7 @@ class DbTool $to = sprintf( ' TO %s@%s', $this->quoteIdentifier($username), - str_replace('%', '%%', $this->quoteIdentifier($host)) + $this->quoteIdentifier($host) ); $dbPrivileges = array(); From 0ae33991bfc48e7cd1d6c96815ba01c6bae208aa Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Mon, 19 Dec 2016 21:14:32 +0100 Subject: [PATCH 2/9] Hook: allow all on CLI (cherry picked from commit 361bfc50814d7138e4c5da60c98837c35093edbf) Signed-off-by: Eric Lippmann --- library/Icinga/Application/Hook.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/Icinga/Application/Hook.php b/library/Icinga/Application/Hook.php index 33761a342..3a158a57c 100644 --- a/library/Icinga/Application/Hook.php +++ b/library/Icinga/Application/Hook.php @@ -184,6 +184,10 @@ class Hook */ protected static function hasPermission($class) { + if (Icinga::app()->isCli()) { + return true; + } + return Auth::getInstance()->hasPermission( Manager::MODULE_PERMISSION_NS . self::extractModuleName($class) ); From 7591e21ccce486948224cadcc744c3c329529490 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Thu, 12 Jan 2017 10:39:36 +0100 Subject: [PATCH 3/9] Support failover API command transport configuration (cherry picked from commit cde55b5764c88111237c8706f743b6eae8938a50) Signed-off-by: Eric Lippmann --- .../library/Monitoring/Command/Transport/CommandTransport.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php index 512de2f28..aa4754729 100644 --- a/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php +++ b/modules/monitoring/library/Monitoring/Command/Transport/CommandTransport.php @@ -3,6 +3,7 @@ namespace Icinga\Module\Monitoring\Command\Transport; +use Exception; use Icinga\Application\Config; use Icinga\Application\Logger; use Icinga\Data\ConfigObject; @@ -122,7 +123,7 @@ class CommandTransport implements CommandTransportInterface if ($this->transferPossible($command, $transport)) { try { $transport->send($command, $now); - } catch (CommandTransportException $e) { + } catch (Exception $e) { Logger::error($e); $errors[] = sprintf('%s: %s.', $name, rtrim($e->getMessage(), '.')); continue; // Try the next transport From 75e066673aaad55ba5ba791fa9d4b3e3056cbbf5 Mon Sep 17 00:00:00 2001 From: Noah Hilverling Date: Mon, 9 Jan 2017 13:57:41 +0100 Subject: [PATCH 4/9] Setup-Wizard-Viewscript: Fix that progress bar is not shown correctly (cherry picked from commit 9578c9f489076f29c40240164e3ae7750eb95d4f) Signed-off-by: Eric Lippmann --- modules/setup/application/views/scripts/index/index.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/setup/application/views/scripts/index/index.phtml b/modules/setup/application/views/scripts/index/index.phtml index 2c07e69fb..b409258e6 100644 --- a/modules/setup/application/views/scripts/index/index.phtml +++ b/modules/setup/application/views/scripts/index/index.phtml @@ -4,7 +4,7 @@ use Icinga\Web\Notification; $pages = $wizard->getPages(); $finished = isset($success); -$configPages = array_slice($pages, 3, count($pages) - 1, true); +$configPages = array_slice($pages, 3, count($pages) - 4, true); $currentPos = array_search($wizard->getCurrentPage(), $pages, true); list($configPagesLeft, $configPagesRight) = array_chunk($configPages, count($configPages) / 2, true); @@ -125,7 +125,7 @@ if ($notifications->hasMessages()) {

translate('Finish', 'setup.progress'); ?>

- + From 6970b79fd7fad550d830f3ded33f43b2fb302a33 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 11 Jan 2017 13:58:22 +0100 Subject: [PATCH 5/9] Doc: Fix permission list for the Icinga 2 API command transport (cherry picked from commit 0e63434d904c3177ff14c22c36f5788d850d1a8b) --- modules/monitoring/doc/commandtransports.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/doc/commandtransports.md b/modules/monitoring/doc/commandtransports.md index dd29e98dc..57aaf1e28 100644 --- a/modules/monitoring/doc/commandtransports.md +++ b/modules/monitoring/doc/commandtransports.md @@ -32,11 +32,11 @@ to the host where you want to send the commands to. We recommend to create/edit ``` object ApiUser "web2" { password = "bea11beb7b810ea9ce6ea" // Change this! - permissions = [ "actions/*", "objects/modify/hosts", "objects/modify/services", "objects/modify/icingaapplications" ] + permissions = [ "actions/*", "objects/modify/hosts", "objects/modify/services", "objects/modify/icingaapplication" ] } ``` -The permissions `actions/*`, `objects/modify/hosts`, `objects/modify/services`, `objects/modify/icingaapplications` are +The permissions `actions/*`, `objects/modify/hosts`, `objects/modify/services`, `objects/modify/icingaapplication` are mandatory in order to submit all external commands from within Icinga Web 2. **Restart Icinga 2** for the changes to take effect. From eca2dd7b9f9f744ffe934cc452fdf77d64c62c35 Mon Sep 17 00:00:00 2001 From: lippserd Date: Wed, 18 Jan 2017 09:07:09 +0100 Subject: [PATCH 6/9] Fix module permissions for hooks (cherry picked from commit 21b75e624ed39a7756fd45c56a6dac7b1f2becc0) Signed-off-by: Eric Lippmann --- library/Icinga/Application/Hook.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Application/Hook.php b/library/Icinga/Application/Hook.php index 3a158a57c..99a350a23 100644 --- a/library/Icinga/Application/Hook.php +++ b/library/Icinga/Application/Hook.php @@ -263,7 +263,7 @@ class Hook } foreach (self::$hooks[$name] as $key => $hook) { - if (self::hasPermission($key)) { + if (self::hasPermission($hook)) { if (self::createInstance($name, $key) === null) { return array(); } @@ -286,7 +286,7 @@ class Hook if (self::has($name)) { foreach (self::$hooks[$name] as $key => $hook) { - if (self::hasPermission($key)) { + if (self::hasPermission($hook)) { return self::createInstance($name, $key); } } @@ -309,6 +309,8 @@ class Hook self::$hooks[$name] = array(); } + $class = ltrim($class, ClassLoader::NAMESPACE_SEPARATOR); + self::$hooks[$name][$key] = $class; } } From 2b0be19fd28c852cedd4e290a51e3f133a5ece31 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 18 Jan 2017 09:23:28 +0100 Subject: [PATCH 7/9] Fix local timestamp for PostgreSQL queries (cherry picked from commit 0dc528fc243ec9ce161afe2f2ae5215aa4c5a684) --- .../library/Monitoring/Backend/Ido/Query/IdoQuery.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php index b81adb85d..47bb48a74 100644 --- a/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php +++ b/modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php @@ -656,7 +656,7 @@ abstract class IdoQuery extends DbQuery $column ); if (version_compare($this->getIdoVersion(), '1.14.2', '>=')) { - $column = str_replace('NOW()', 'localtimestamp', $column); + $column = str_replace('NOW()', 'NOW() AT TIME ZONE \'UTC\'', $column); } else { $column = preg_replace( '/UNIX_TIMESTAMP(\((?>[^()]|(?-1))*\))/i', From 72ccfd66a4469580fe256977237f9302cd7cbd04 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 18 Jan 2017 13:25:39 +0100 Subject: [PATCH 8/9] Update to icinga.com (cherry picked from commit 1da67cfbc04b3395f89e1bf71a771c3fd2dda635) --- .../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 | 14 +++---- .../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 | 10 ++--- 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, 95 insertions(+), 95 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..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.org/projects/icingaweb2/roadmap +https://github.com/icinga/icingaweb2 # 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..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.org' + '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/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..80068e628 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://github.com/icinga/icingaweb2', null, array( 'target' => '_blank', @@ -72,27 +72,27 @@ ) ?> qlink( null, - 'https://www.icinga.org/services/support', + 'https://www.icinga.com/services/support', null, array( 'target' => '_blank', 'icon' => 'chat-empty', - 'title' => $this->translate('Support / Mailinglists') + 'title' => $this->translate('Support') ) ) ?> qlink( null, - 'https://wiki.icinga.org', + 'https://www.icinga.com/community/get-involved/', null, array( 'target' => '_blank', 'icon' => 'lightbulb', - 'title' => $this->translate('Icinga Wiki') + 'title' => $this->translate('Icinga Community') ) ) ?> 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..0063dd1a1 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' ) @@ -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)) ); } @@ -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 9264c46f9..c8bb99270 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 d74124bd12f53d13b5a6ea5408e9783cc5190d1e Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 18 Jan 2017 15:27:53 +0100 Subject: [PATCH 9/9] Version 2.4.1 --- ChangeLog | 14 ++++++++++++++ VERSION | 2 +- doc/02-Installation.md | 4 ++-- icingaweb2.spec | 4 ++-- library/Icinga/Application/Version.php | 2 +- modules/doc/module.info | 2 +- modules/monitoring/module.info | 2 +- modules/setup/module.info | 2 +- modules/test/module.info | 2 +- modules/translation/module.info | 2 +- 10 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0696aaca..30ed02c2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,20 @@ ## What's New +### What's New in Version 2.4.1 + +Our public repositories and issue tracker have been migrated to GitHub. + +#### Bugfixes + +* Bug 2651: [dev.icinga.com #13607] Displayed times messed up in Icinga Web 2.4.0 w/ PostgreSQL +* Bug 2654: [dev.icinga.com #13615] Setup wizard: Not possible to setup Icinga Web 2 with an external database +* Bug 2663: [dev.icinga.com #13691] Hook::all() is broken on CLI +* Bug 2669: [dev.icinga.com #13735] Setup wizard: Progress bar isn't shown correctly, if setup is at finish step +* Bug 2681: [dev.icinga.com #13957] Support failover API command transport configuration +* Bug 2686: Granular module permissions do not work for hooks +* Bug 2687: Update URLs to icinga.com, remove wiki & update to GitHub + ### What's New in Version 2.4.0 #### Feature diff --git a/VERSION b/VERSION index 8721bbc46..a37212091 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.4.0 +v2.4.1 diff --git a/doc/02-Installation.md b/doc/02-Installation.md index 44beedcbd..55e614370 100644 --- a/doc/02-Installation.md +++ b/doc/02-Installation.md @@ -451,9 +451,9 @@ Finally visit Icinga Web 2 in your browser to login as `icingaadmin` user: `/ici ## Upgrading Icinga Web 2 -### Upgrading to Icinga Web 2 2.4.0 +### Upgrading to Icinga Web 2 2.4.x -* Icinga Web 2 version 2.4.0 does not introduce any backward incompatible change. +* Icinga Web 2 version 2.4.x does not introduce any backward incompatible change. ### Upgrading to Icinga Web 2 2.3.x diff --git a/icingaweb2.spec b/icingaweb2.spec index af2e41cec..fed584f90 100644 --- a/icingaweb2.spec +++ b/icingaweb2.spec @@ -1,9 +1,9 @@ # Icinga Web 2 | (c) 2013-2016 Icinga Development Team | GPLv2+ -%define revision 2 +%define revision 1 Name: icingaweb2 -Version: 2.4.0 +Version: 2.4.1 Release: %{revision}%{?dist} Summary: Icinga Web 2 Group: Applications/System diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php index e54abc97b..8b598cec6 100644 --- a/library/Icinga/Application/Version.php +++ b/library/Icinga/Application/Version.php @@ -8,7 +8,7 @@ namespace Icinga\Application; */ class Version { - const VERSION = '2.4.0'; + const VERSION = '2.4.1'; /** * Get the version of this instance of Icinga Web 2 diff --git a/modules/doc/module.info b/modules/doc/module.info index 5acf736a6..e9071acee 100644 --- a/modules/doc/module.info +++ b/modules/doc/module.info @@ -1,4 +1,4 @@ Module: doc -Version: 2.4.0 +Version: 2.4.1 Description: Documentation module Extracts, shows and exports documentation for Icinga Web 2 and its modules. diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info index 643af3293..123f35daa 100644 --- a/modules/monitoring/module.info +++ b/modules/monitoring/module.info @@ -1,5 +1,5 @@ Module: monitoring -Version: 2.4.0 +Version: 2.4.1 Description: Icinga monitoring module This is the core module for most Icingaweb users. It provides an abstraction layer for various Icinga data backends. diff --git a/modules/setup/module.info b/modules/setup/module.info index 9c4db9932..a718f3997 100644 --- a/modules/setup/module.info +++ b/modules/setup/module.info @@ -1,5 +1,5 @@ Module: setup -Version: 2.4.0 +Version: 2.4.1 Description: Setup module Web based wizard for setting up Icinga Web 2 and its modules. This includes the data backends (e.g. relational database, LDAP), diff --git a/modules/test/module.info b/modules/test/module.info index 74d7d3969..b41d25fa6 100644 --- a/modules/test/module.info +++ b/modules/test/module.info @@ -1,5 +1,5 @@ Module: test -Version: 2.4.0 +Version: 2.4.1 Description: Translation module This module allows developers to run (unit) tests against Icinga Web 2 and any of its modules. Usually you do not need to enable this. diff --git a/modules/translation/module.info b/modules/translation/module.info index becec9567..3ed707550 100644 --- a/modules/translation/module.info +++ b/modules/translation/module.info @@ -1,5 +1,5 @@ Module: translation -Version: 2.4.0 +Version: 2.4.1 Description: Translation module This module allows developers and translators to translate Icinga Web 2 and its modules for multiple languages. You do not need this module to run an