[Pkg-nagios-changes] [pkg-icinga-web] 01/01: Imported Upstream version 1.11.2
Markus Frosch (old DM Account)
lazyfrosch-guest at moszumanska.debian.org
Sun Oct 19 18:35:28 UTC 2014
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch upstream
in repository pkg-icinga-web.
commit 852c1bd0158dbf42db85613d25fc1699522e377b
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Sun Oct 19 20:21:47 2014 +0200
Imported Upstream version 1.11.2
---
.mailmap | 37 ++++++++
README | 19 ++--
README.md | 1 +
app/modules/AppKit/config/javascript.xml | 1 -
app/modules/AppKit/lib/js/utils/String.js | 30 ------
.../lib/js/Cronk/grid/renderer/ColumnRenderer.js | 28 +++---
.../Cronks/Tackle/Information/LongPluginOutput.js | 1 -
.../Cronks/Tackle/Information/OutputPanel.js | 12 ---
configure | 20 ++--
doc/AUTHORS | 26 ++++--
doc/CHANGELOG-1.11 | 58 ++++++++++++
doc/INSTALL | 101 ++++++++++++++++++++-
doc/INSTALL.md | 1 +
doc/README.RHEL | 2 +-
doc/README.SUSE | 2 +-
etc/apache2/icinga-web.conf.in | 57 +++++++++---
etc/make/version.m4 | 4 +-
etc/schema/create_oracle_sys.sql | 4 +-
etc/schema/mysql.sql | 2 +-
etc/schema/oracle.sql | 11 +--
etc/schema/pgsql.sql | 2 +-
etc/schema/sqlite.sql | 2 +-
etc/schema/updates/mysql/mysql_v1-11_to_1-11-2.sql | 4 +
.../updates/oracle/oracle_v1-11_to_1-11-2.sql | 10 ++
etc/schema/updates/pgsql/pgsql_v1-11_to_1-11-2.sql | 6 ++
icinga-web.spec | 37 +++++---
26 files changed, 348 insertions(+), 130 deletions(-)
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..664a7e7
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,37 @@
+Gunnar Beutner <gunnar.beutner at netways.de> <gunnar at beutner.name>
+Gunnar Beutner <gunnar.beutner at netways.de> <gunnar at blade9.beutner.name>
+Michael Friedrich <michael.friedrich at netways.de> <michael.friedrich at gmail.com>
+Michael Friedrich <michael.friedrich at netways.de> <Michael.Friedrich at netways.de>
+Michael Friedrich <michael.friedrich at netways.de> <michael.friedrich at univie.ac.at>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jannis.mosshammer at netways.com>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at debian.int.netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at debian.localhost>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at localhost.localdomain>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at mojadev-VGN-NW11S-S.(none)>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at ubuntu.(none)>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at ws-jmosshammer.(none)>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <moja at ws-jmosshammer.local>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <mojadev at gmail.com>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <mojadev at localhost.localdomain>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <mojadev at mojadev-laptop.(none)>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <jmosshammer at localhost.localdomain>
+Jannis Mosshammer <jannis.mosshammer at netways.de> <root at ws-jmosshammer-vm.(none)>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Mo�hammer <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Mohammer <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Moßhammer <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Moßhanner <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Moßhammer <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Moßhanner <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> Jannis Mo<A7>hammer <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de> jmosshammer <jannis.mosshammer at netways.de>
+Marius Hein <marius.hein at netways.de> <mhein at sasquatch.local.itsocks.de>
+Marius Hein <marius.hein at netways.de> <mhein at waheela>
+Marius Hein <marius.hein at netways.de> <mhein at waheela.(none)>
+Marius Hein <marius.hein at netways.de> <mhein at ws-jmosshammer.(none)>
+Marius Hein <marius.hein at netways.de> <root at sasquatch.local.itsocks.de>
+Michael Luebben <michael at luebben-home.de> <mickey2002 at devel.(none)>
+Bernd Erk <bernd.erk at netways.de> <vm_user at localhost.localdomain>
+Bernd Erk <bernd.erk at netways.de> <root at debian.localhost>
+Bernd Erk <bernd.erk at netways.de> <root at linux-7kv8.site>
+Bernd Erk <bernd.erk at netways.de> <root at localhost.localdomain>
+Markus Frosch <markus.frosch at netways.de> <markus at lazyfrosch.de>
diff --git a/README b/README
index 72b7cf0..b77b97b 100644
--- a/README
+++ b/README
@@ -1,21 +1,18 @@
+# Icinga Web 1.x
---------------------------------------------------------
+## About
-Icinga-Web
-
-This is a new, versatile, web frontend to use with Icinga.
+This is a new, versatile, web frontend to use with Icinga 1.x and 2.x.
It is an official part of the Icinga project and aims to
replace the regular CGIs.
+## Installation
+
For detailed information about installation, legal and all
other, please take a look into ./doc
-Visit the Icinga homepage at http://www.icinga.org for online
+## Support
+
+Visit the Icinga homepage at https://www.icinga.org for online
documentation, new releases, bug reports, information on the mailing
lists, etc.
-
-Regards,
-
- The Icinga Development Team
-
---------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 120000
index 0000000..100b938
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+README
\ No newline at end of file
diff --git a/app/modules/AppKit/config/javascript.xml b/app/modules/AppKit/config/javascript.xml
index 81b87bc..81a48bc 100644
--- a/app/modules/AppKit/config/javascript.xml
+++ b/app/modules/AppKit/config/javascript.xml
@@ -59,7 +59,6 @@
<ae:parameter>%core.root_dir%/lib/jsgettext/lib/Gettext.js</ae:parameter>
<ae:parameter>%core.module_dir%/AppKit/lib/js/ext-overrides/TreeNodeDontLeak.js</ae:parameter>
- <ae:parameter>%core.module_dir%/AppKit/lib/js/utils/String.js</ae:parameter>
</javascript>
<!--
diff --git a/app/modules/AppKit/lib/js/utils/String.js b/app/modules/AppKit/lib/js/utils/String.js
deleted file mode 100644
index 0ea3d3f..0000000
--- a/app/modules/AppKit/lib/js/utils/String.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// {{{ICINGA_LICENSE_CODE}}}
-// -----------------------------------------------------------------------------
-// This file is part of icinga-web.
-//
-// Copyright (c) 2009-present Icinga Developer Team.
-// All rights reserved.
-//
-// icinga-web is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// icinga-web is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with icinga-web. If not, see <http://www.gnu.org/licenses/>.
-// -----------------------------------------------------------------------------
-// {{{ICINGA_LICENSE_CODE}}}
-
-(function() {
- "use static";
-
- String.prototype.nl2br = function() {
- return (this + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br />$2');
- };
-
-})();
\ No newline at end of file
diff --git a/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js b/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
index 373b8c1..e527519 100644
--- a/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
+++ b/app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
@@ -1,20 +1,20 @@
// {{{ICINGA_LICENSE_CODE}}}
// -----------------------------------------------------------------------------
// This file is part of icinga-web.
-//
+//
// Copyright (c) 2009-present Icinga Developer Team.
// All rights reserved.
-//
+//
// icinga-web is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
-//
+//
// icinga-web is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with icinga-web. If not, see <http://www.gnu.org/licenses/>.
// -----------------------------------------------------------------------------
@@ -80,12 +80,7 @@ Ext.ns('Cronk.grid');
Cronk.grid.ColumnRenderer = {
customColumnPerfdataSanitized: function (cfg) {
-
- var multiLine = false;
-
- if (!Ext.isEmpty(cfg.multiLine) && cfg.multiLine) {
- multiLine = true;
- }
+ var multiLine = cfg.multiLine ? true : false;
return function (value, metaData, record, rowIndex, colIndex, store) {
if (!value) {
@@ -104,12 +99,17 @@ Ext.ns('Cronk.grid');
return output;
}
- metaData.attr = 'ext:qtip="' + Ext.util.Format.htmlEncode(value) + '"';
-
- if (multiLine === true) {
- value = String(value).nl2br();
+ if (multiLine) {
+ /*
+ * According to http://www.ietf.org/rfc/rfc4627.txt the JSON representation of strings must escape
+ * control characters which includes the line feed `\n' and the carriage return `\r'. So '\n', '\r'
+ * and '\r\n' become '\\n', '\\r' and '\\r\\n' respectively.
+ */
+ value = Ext.util.Format.nl2br(value.replace(/\\r/g, '\r').replace(/\\n/g, '\n'));
}
+ metaData.attr = 'ext:qtip="' + Ext.util.Format.htmlEncode(value) + '"';
+
return value;
};
},
diff --git a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
index 668efc0..8f93846 100644
--- a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
+++ b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/LongPluginOutput.js
@@ -29,7 +29,6 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
Icinga.Cronks.Tackle.Information.LongPluginOutput = Ext.extend(
Icinga.Cronks.Tackle.Information.OutputPanel, {
title: _("Long plugin output"),
- keepLineBreaksInHTML: true,
tplField: 'object_long_output'
});
diff --git a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js
index 3049216..fbb8026 100644
--- a/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js
+++ b/app/modules/Cronks/lib/js/Icinga/Cronks/Tackle/Information/OutputPanel.js
@@ -28,7 +28,6 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
Icinga.Cronks.Tackle.Information.OutputPanel = Ext.extend(Ext.Panel, {
autoScroll: true,
- keepLineBreaksInHTML: false,
constructor: function(c) {
Icinga.Cronks.Tackle.Information
@@ -49,17 +48,6 @@ Ext.ns('Icinga.Cronks.Tackle.Information');
Icinga.Cronks.Tackle.Information
.OutputPanel.superclass.initComponent.call(this);
- },
-
- update: function(htmlOrData, loadScripts, cb) {
- if (!Ext.isEmpty(this.tplField) && this.keepLineBreaksInHTML === true) {
- if (!Ext.isEmpty(htmlOrData[this.tplField])) {
- htmlOrData[this.tplField] = String(htmlOrData[this.tplField]).nl2br();
- }
- }
-
- Icinga.Cronks.Tackle.Information
- .OutputPanel.superclass.update.call(this, htmlOrData, loadScripts, cb);
}
});
diff --git a/configure b/configure
index e59ee5a..0256c30 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for icinga-web 1.11.1.
+# Generated by GNU Autoconf 2.69 for icinga-web 1.11.2.
#
# Report bugs to <dev.icinga.org>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='icinga-web'
PACKAGE_TARNAME='icinga-web'
-PACKAGE_VERSION='1.11.1'
-PACKAGE_STRING='icinga-web 1.11.1'
+PACKAGE_VERSION='1.11.2'
+PACKAGE_STRING='icinga-web 1.11.2'
PACKAGE_BUGREPORT='dev.icinga.org'
PACKAGE_URL=''
@@ -1272,7 +1272,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures icinga-web 1.11.1 to adapt to many kinds of systems.
+\`configure' configures icinga-web 1.11.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1333,7 +1333,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of icinga-web 1.11.1:";;
+ short | recursive ) echo "Configuration of icinga-web 1.11.2:";;
esac
cat <<\_ACEOF
@@ -1465,7 +1465,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-icinga-web configure 1.11.1
+icinga-web configure 1.11.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1482,7 +1482,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by icinga-web $as_me 1.11.1, which was
+It was created by icinga-web $as_me 1.11.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1832,7 +1832,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Release date
-RELEASE_DATE=2014-06-24
+RELEASE_DATE=2014-08-13
@@ -3368,7 +3368,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by icinga-web $as_me 1.11.1, which was
+This file was extended by icinga-web $as_me 1.11.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3421,7 +3421,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-icinga-web config.status 1.11.1
+icinga-web config.status 1.11.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/doc/AUTHORS b/doc/AUTHORS
index c0e98d1..0ffe3c9 100644
--- a/doc/AUTHORS
+++ b/doc/AUTHORS
@@ -1,8 +1,18 @@
-Icinga Developer Team info at icinga.org
-
-Marius Hein marius.hein at netways.de
-Christian Doebler christian.doebler at netways.de
-Michael Luebben michael_luebben at web.de
-Jannis Moßhammer jannis.mosshammer at netways.de
-Eric Lippmann eric.lippmann at netways.de
-Markus Frosch markus at lazyfrosch.de
+Bernd Erk <bernd.erk at netways.de>
+Christian Dengler <christian.dengler at netways.de>
+Christian Doebler <christian.doebler at netways.de>
+Christoph Maser <cmr at financial.com>
+David Mikulski <d.mikulski at t-online.de>
+Dirk Goetz <dirk.goetz at netways.de>
+Eric Lippmann <eric.lippmann at netways.de>
+Gunnar Beutner <gunnar.beutner at netways.de>
+Hendrik Baecker <andurin at process-zero.de>
+Jannis Mo�hammer <jannis.mosshammer at netways.de>
+Jannis Mosshammer <jannis.mosshammer at netways.de>
+Marius Hein <marius.hein at netways.de>
+Markus Frosch <markus.frosch at netways.de>
+Michael Friedrich <michael.friedrich at netways.de>
+Michael Luebben <michael at luebben-home.de>
+Stuart Henderson <stu at spacehopper.org>
+Thomas Dressler <tdressler at tdressler.net>
+Tom Theisen <muling at muling.lu>
diff --git a/doc/CHANGELOG-1.11 b/doc/CHANGELOG-1.11
index 0e13127..8c2a551 100644
--- a/doc/CHANGELOG-1.11
+++ b/doc/CHANGELOG-1.11
@@ -5,6 +5,64 @@ Icinga-web 1.11 changelog
Thanks to all contributers, testers and developers. Please read AUTHORS and
THANKS for a detailed list :-)
+[[ 1.11.2 - 2014-08-13 ]]
+
+[ NOTABLE CHANGES ]
+
+* Apache 2.4.3+ requires 'Require all granted' in each '<Directory>' directive
+ in the apache configuration file. Support has been added in the shipped apache
+ configuration file. Check /etc/{httpd/apache2}/conf.d/icinga-web.conf.rpmnew
+ and update your existing config when upgrading on RHEL/SUSE based systems. #6770
+
+
+[ Bugs ]
+
+ * Fix apache2 restart on rewrite in SUSE rpms. (#6663)
+
+ * Fix Apache 2.4 error "client denied by server configuration". (#6770)
+
+ * Fix missing build dependency for 'make'. (#6816)
+
+ * Fix wrong database name in package readme files. (#6859)
+
+ * Revert "LongPluginOutput: Fix missing support of multi line in html". (#2653)
+
+ * Grid/columns: Replace new lines with the HTML break when `multiLine' is enabled. (#2653)
+
+ Example config:
+
+ <?xml version="1.0" encoding="utf-8" standalone="yes"?>
+ <template match-pattern="icinga-(service-template|.+-service-problems)">
+ <fields>
+ <field name="plugin_long_output">
+ <datasource>
+ <parameter name="field">SERVICE_LONG_OUTPUT</parameter>
+ </datasource>
+ <display>
+ <parameter name="visible">true</parameter>
+ <parameter name="label">Long output</parameter>
+ <parameter name="jsFunc">
+ <parameter>
+ <parameter name="namespace">Cronk.grid.ColumnRenderer</parameter>
+ <parameter name="function">customColumnPerfdataSanitized</parameter>
+ <parameter name="arguments">
+ <parameter name="multiLine">1</parameter>
+ </parameter>
+ </parameter>
+ </parameter>
+ </display>
+ <filter>
+ <parameter name="enabled">false</parameter>
+ </filter>
+ <order>
+ <parameter name="enabled">false</parameter>
+ <parameter name="default">false</parameter>
+ </order>
+ </field>
+ </fields>
+ </template>
+
+
[[ 1.11.1 - 2014-06-24 ]]
NOTE: Please apply the database schema update for your database!
diff --git a/doc/INSTALL b/doc/INSTALL
index 477389c..0624064 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -1,6 +1,99 @@
-Icinga web is installed via ./configure and make install.
-Database install and upgrade schemas can be found under etc/schema
+# Installation
-For a quickstart guide please goto:
+## Packages
-https://wiki.icinga.org/display/howtos/Setting+up+icinga-web+-+Quickstart
+The Icinga Wiki holds some detailed guides on installing Icinga Web
+using packages.
+https://wiki.icinga.org/display/howtos/Setting+up+Icinga+Web
+
+Look into your distribution's package repository if there are
+packages available. If not, ask the distribution upstream.
+
+## Source
+
+There is a detailed from scratch installation guide available:
+http://docs.icinga.org/latest/en/icinga-web-scratch.html
+
+Call `./configure --help` and `make` to get a list of available options.
+
+## Build Requirements
+
+* Apache 2.2+, Nginx or any other webserver
+* PHP 5.2.6+ (cli, pear, xmlrpc, xsl, soap, gd, ldap, json, gettext, sockets)
+* PHP PDO MySQL or PostgreSQL
+* MySQL or PostgreSQL database for the internal backend (sesssions, etc)
+* XML Syntax-highlighting for your preferred editor
+
+## Database Schema
+
+The database schema files are located in `etc/schema`. You can import them manually.
+
+### MySQL
+ # mysql -u root -p
+
+ CREATE USER `icinga_webweb`@`localhost` IDENTIFIED BY 'icinga_webweb';
+ CREATE DATABASE `icinga_web`;
+ GRANT ALL PRIVILEGES ON `icinga_web`.* TO `icinga_web`@`localhost`;
+ FLUSH PRIVILEGES;
+ quit
+
+ # mysql -u root -p icinga_web < etc/schema/mysql.sql
+
+
+
+### PostgreSQL
+
+ #> su - postgres
+
+ $ psql
+
+ postgres=# CREATE USER icinga_web WITH PASSWORD 'icinga_web';
+ postgres=# CREATE DATABASE icinga_web;
+ postgres=# \q
+
+
+Add the `icinga_web` user to trusted authentication in the `pg_hba.conf` configuration
+file and restart the PostgreSQL server.
+
+ local icinga_web icinga_web trust
+ host icinga_web icinga_web 127.0.0.1/32 trust
+ host icinga_web icinga_web ::1/128 trust
+
+Install the schema
+
+ $ psql -U icinga_web -d icinga_web -a -f etc/schema/pgsql.sql
+
+## Building Release Tarballs
+
+In order to build a release tarball you should first check out the Git repository
+in a new directory. If you're using an existing check-out you should make sure
+that there are no local modifications:
+
+$ git status
+
+Here's a short check-list for releases:
+
+* Update `etc/make/version.m4` and run `autoconf` generating a new version and date.
+* Update the .mailmap and AUTHORS files
+ $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > doc/AUTHORS
+* Bump the version and update %changelog at the bottom in icinga-web.spec.
+* Update the doc/CHANGELOG-$majorversion file.
+* Commit these changes to the "support/$majorversion" branch and create a signed tag (tags/v<VERSION>).
+ $ git commit -v -a -m "Release version <VERSION>"
+ $ git tag -u EE8E0720 -m "Version <VERSION>" v<VERSION>
+ $ git push --tags
+* Merge the "support/$majorversion" branch into the "master" branch (using --ff-only).
+ $ git checkout master
+ $ git merge --ff-only support/$majorversion
+ $ git push origin master
+* Merge the "support/$majorversion" branch into the "next" branch
+
+Use "git archive" to build the release tarball:
+
+$ VERSION=1.11.2
+$ git archive --format=tar --prefix=icinga-web-$VERSION/ tags/v$VERSION | gzip >icinga-web-$VERSION.tar.gz
+
+Finally you should verify that the tarball only contains the files it should contain:
+
+$ VERSION=1.11.2
+$ tar ztf icinga-web-$VERSION.tar.gz | less
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
new file mode 120000
index 0000000..842bf0e
--- /dev/null
+++ b/doc/INSTALL.md
@@ -0,0 +1 @@
+INSTALL
\ No newline at end of file
diff --git a/doc/README.RHEL b/doc/README.RHEL
index 83b5cee..87ecac0 100644
--- a/doc/README.RHEL
+++ b/doc/README.RHEL
@@ -49,7 +49,7 @@ Database Setup
# mysql -u root -p
-mysql> CREATE DATABASE icinga;
+mysql> CREATE DATABASE icinga_web;
GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'icinga_web';
diff --git a/doc/README.SUSE b/doc/README.SUSE
index 61415e9..143a0a9 100644
--- a/doc/README.SUSE
+++ b/doc/README.SUSE
@@ -45,7 +45,7 @@ Database Setup
# mysql -u root -p
-mysql> CREATE DATABASE icinga;
+mysql> CREATE DATABASE icinga_web;
GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'icinga_web';
diff --git a/etc/apache2/icinga-web.conf.in b/etc/apache2/icinga-web.conf.in
index be97da3..affe7ef 100644
--- a/etc/apache2/icinga-web.conf.in
+++ b/etc/apache2/icinga-web.conf.in
@@ -1,13 +1,8 @@
####
# Icinga Web Apache configuration
+# Supports 2.2 and 2.4
#
-# this file includes all RewriteRules required
-#
-# No .htaccess file is needed under
-# the application paths.
-#
-# (c) 2012 Icinga Development Team
-# Markus Frosch <markus at lazyfrosch.de>
+# Copyright (C) 2009-2014 Icinga Development Team (http://www.icinga.org)
###
# Matching for module stylesheet and images
@@ -22,26 +17,66 @@ RedirectMatch "^@web_path@$" @web_path@/
# Access to where the styles are located
<DirectoryMatch "^@prefix@/app/modules/\w+/pub/styles/">
Options -Indexes -MultiViews
- Allow from all
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ <RequireAll>
+ Require all granted
+ </RequireAll>
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
+ Order allow,deny
+ Allow from all
+ </IfModule>
</DirectoryMatch>
# Access to where the images are located
<DirectoryMatch "^@prefix@/app/modules/\w+/pub/images/">
Options -Indexes -MultiViews
- Allow from all
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ <RequireAll>
+ Require all granted
+ </RequireAll>
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
+ Order allow,deny
+ Allow from all
+ </IfModule>
</DirectoryMatch>
# Access to the ext3 library
<Directory "@prefix@/lib/ext3/">
Options -Indexes -MultiViews
- Allow from all
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ <RequireAll>
+ Require all granted
+ </RequireAll>
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
+ Order allow,deny
+ Allow from all
+ </IfModule>
</Directory>
# Access to the public web folder of Icinga Web
<Directory "@prefix@/pub/">
DirectoryIndex index.php
Options -MultiViews -Indexes +FollowSymLinks
- Allow from all
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ <RequireAll>
+ Require all granted
+ </RequireAll>
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
+ Order allow,deny
+ Allow from all
+ </IfModule>
RewriteEngine On
# @web_path@ is base for all rewrite rules
diff --git a/etc/make/version.m4 b/etc/make/version.m4
index 566c917..d62e139 100644
--- a/etc/make/version.m4
+++ b/etc/make/version.m4
@@ -9,5 +9,5 @@ dnl to tag a specific release. Icinga releases do not use
dnl this name.
dnl
-m4_define([ICINGA_VERSION], [1.11.1])
-m4_define([ICINGA_RELEASE_DATE], [2014-06-24])
+m4_define([ICINGA_VERSION], [1.11.2])
+m4_define([ICINGA_RELEASE_DATE], [2014-08-13])
diff --git a/etc/schema/create_oracle_sys.sql b/etc/schema/create_oracle_sys.sql
index f0c4ba1..5548f76 100644
--- a/etc/schema/create_oracle_sys.sql
+++ b/etc/schema/create_oracle_sys.sql
@@ -4,12 +4,10 @@
-- Create icinga tablespace and user (SYS User part)
-- called and defines set from oracle.sql
--
--- Copyright (c) 2009-2012 Icinga Development Team (http://www.icinga.org)
+-- Copyright (c) 2009-2014 Icinga Development Team (http://www.icinga.org)
--
-- works with Oracle10+ and sqlplus
-- for because of grants on v$ views this must run as sys
--- initial version: 2011-03-07 Thomas Dressler
--- current version: 2012-10-09
-- --------------------------------------------------------
*/
-- -----------------------------------------
diff --git a/etc/schema/mysql.sql b/etc/schema/mysql.sql
index 9c79ab2..44df5b8 100644
--- a/etc/schema/mysql.sql
+++ b/etc/schema/mysql.sql
@@ -42,7 +42,7 @@ ALTER TABLE nsm_user_role ADD CONSTRAINT nsm_user_role_usro_role_id_nsm_role_rol
/* Initial data import */
INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled,user_modified,user_created) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0', NOW(), NOW());
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.1', NOW(), NOW());
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.2', NOW(), NOW());
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/etc/schema/oracle.sql b/etc/schema/oracle.sql
index bb0e42c..29b8a1e 100644
--- a/etc/schema/oracle.sql
+++ b/etc/schema/oracle.sql
@@ -1,10 +1,10 @@
/*
-- ****************************************************
--- based on oracle.sql supplied with icinga-web-1.7.0.tar.gz
-- Auto generated oracle SQL Schema file for icinga-web
--- Creation date: 2011-02-13T21:02:36+01:00
-- ****************************************************
---
+--
+-- Copyright (c) 2009-2014 Icinga Development Team (http://www.icinga.org)
+--
-- look for DEFINE commands and check for your needs !!!!
--
-- check standard database connectivity with test connect to <instance> with sqlplus
@@ -18,9 +18,6 @@
-- sqlplus <icinga-web-user-just-created>@<instance> @create_icingaweb_objects
-- enter password
-- check for errors in create_icingaweb_objects.log
---
--- initial version: 2012-03-07 Thomas Dreßler
--- current version: 2013-03-17 Thomas Dreßler
-- -- --------------------------------------------------------
*/
set sqlprompt "&&_USER@&&_CONNECT_IDENTIFIER SQL>"
@@ -621,7 +618,7 @@ INSERT INTO nsm_target (target_id,target_name,target_description,target_class,ta
INSERT INTO nsm_user (user_id,user_account,user_name,user_firstname,user_lastname,user_password,user_salt,user_authsrc,user_email,user_disabled,user_created,user_modified) VALUES ('1','0','root','Enoch','Root','42bc5093863dce8c150387a5bb7e3061cf3ea67d2cf1779671e1b0f435e953a1','0c099ae4627b144f3a7eaa763ba43b10fd5d1caa8738a98f11bb973bebc52ccd','internal','root at localhost.local','0',sysdate,sysdate);
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO nsm_principal (principal_id,principal_user_id,principal_type,principal_disabled) VALUES ('1','1','user','0');
INSERT INTO nsm_principal (principal_id,principal_role_id,principal_type,principal_disabled) VALUES ('2','2','role','0');
diff --git a/etc/schema/pgsql.sql b/etc/schema/pgsql.sql
index 9cc5a03..cec7e1e 100644
--- a/etc/schema/pgsql.sql
+++ b/etc/schema/pgsql.sql
@@ -655,7 +655,7 @@ COPY cronk_principal_cronk (cpc_principal_id, cpc_cronk_id) FROM stdin;
--
COPY nsm_db_version (id, version, modified, created) FROM stdin;
-1 icinga-web/v1.11.1 2014-06-24 00:00:00 2014-06-24 00:00:00
+1 icinga-web/v1.11.2 2014-06-24 00:00:00 2014-06-24 00:00:00
\.
diff --git a/etc/schema/sqlite.sql b/etc/schema/sqlite.sql
index f9beeb4..bebb1ba 100644
--- a/etc/schema/sqlite.sql
+++ b/etc/schema/sqlite.sql
@@ -173,7 +173,7 @@ CREATE TABLE cronk_principal_category (
/* Initial data import */
-INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.1', DATETIME('now'), DATETIME('now'));
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.2', DATETIME('now'), DATETIME('now'));
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('1','IcingaHostgroup','Limit data access to specific hostgroups','IcingaDataHostgroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('2','IcingaServicegroup','Limit data access to specific servicegroups','IcingaDataServicegroupPrincipalTarget','icinga');
INSERT INTO nsm_target (target_id,target_name,target_description,target_class,target_type) VALUES ('3','IcingaHostCustomVariablePair','Limit data access to specific custom variables','IcingaDataHostCustomVariablePrincipalTarget','icinga');
diff --git a/etc/schema/updates/mysql/mysql_v1-11_to_1-11-2.sql b/etc/schema/updates/mysql/mysql_v1-11_to_1-11-2.sql
new file mode 100644
index 0000000..f918027
--- /dev/null
+++ b/etc/schema/updates/mysql/mysql_v1-11_to_1-11-2.sql
@@ -0,0 +1,4 @@
+-- Default version change
+DELETE FROM nsm_db_version;
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.2', NOW(), NOW());
+
diff --git a/etc/schema/updates/oracle/oracle_v1-11_to_1-11-2.sql b/etc/schema/updates/oracle/oracle_v1-11_to_1-11-2.sql
new file mode 100644
index 0000000..a2cba9e
--- /dev/null
+++ b/etc/schema/updates/oracle/oracle_v1-11_to_1-11-2.sql
@@ -0,0 +1,10 @@
+--error handler
+whenever sqlerror exit failure
+
+-- Default version bump
+DELETE FROM nsm_db_version;
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+
+--final commit
+commit;
+
diff --git a/etc/schema/updates/pgsql/pgsql_v1-11_to_1-11-2.sql b/etc/schema/updates/pgsql/pgsql_v1-11_to_1-11-2.sql
new file mode 100644
index 0000000..d176cbd
--- /dev/null
+++ b/etc/schema/updates/pgsql/pgsql_v1-11_to_1-11-2.sql
@@ -0,0 +1,6 @@
+BEGIN;
+
+DELETE FROM nsm_db_version;
+INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.11.2', NOW(), NOW());
+
+END;
diff --git a/icinga-web.spec b/icinga-web.spec
index c051aff..a5ac3a1 100644
--- a/icinga-web.spec
+++ b/icinga-web.spec
@@ -37,7 +37,7 @@
Summary: Open Source host, service and network monitoring Web UI
Name: icinga-web
-Version: 1.11.1
+Version: 1.11.2
Release: %{revision}%{?dist}
License: GPLv3
Group: Applications/System
@@ -52,6 +52,7 @@ Source0: https://github.com/Icinga/icinga-web/releases/download/v%{version}/icin
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: make
BuildRequires: %{phpbuildname} >= 5.2.3
BuildRequires: %{phpbuildname}-devel >= 5.2.3
BuildRequires: %{phpbuildname}-gd
@@ -213,18 +214,24 @@ fi
# uncomment if building from git
# %{__rm} -rf %{buildroot}%{_datadir}/icinga-web/.git
+%preun
%if "%{_vendor}" == "suse"
-a2enmod rewrite
-if service apache2 status; then
- service apache2 restart
-fi
+ %restart_on_update apache2
%endif
-%preun
-
%post
# clean config cache, e.g. after upgrading
-%{__rm} -rf %{cachedir}/config/*.php
+%{name}-clearcache
+
+%if "%{_vendor}" == "suse"
+ a2enmod rewrite
+ %restart_on_update apache2
+%endif
+
+%postun
+%if "%{_vendor}" == "suse"
+ %restart_on_update apache2
+%endif
%post pgsql
### change databases.xml to match pgsql config
@@ -249,7 +256,12 @@ fi
%post module-pnp
# clean cronk template cache
-%{__rm} -rf %{cachedir}/CronkTemplates/*.php
+%{name}-clearcache
+
+%postun module-pnp
+if [ -f %{_sbindir}/%{name}-clearcache ]; then
+ %{name}-clearcache
+fi
%clean
%{__rm} -rf %{buildroot}
@@ -310,6 +322,9 @@ fi
%attr(-,icinga,icinga) %{_localstatedir}/log/icingaCron
%changelog
+* Wed Aug 13 2014 Michael Friedrich <michael.friedrich at netways.de> - 1.11.2-1
+- bump to 1.11.2
+
* Thu Jun 26 2014 Marius Hein <marius.hein at netways.de> - 1.11.1-1
- release 1.11.1
@@ -337,10 +352,10 @@ fi
* Tue Apr 30 2013 Markus Frosch <markus at lazyfrosch.de> - 1.9.0-0.1.beta
- release 1.9.0-beta
-* Thu Feb 15 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.2-2
+* Fri Feb 15 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.2-2
- fix rpmlint errors/warnings
-* Wed Feb 11 2013 Markus Frosch <markus.frosch at netways.de> - 1.8.2-1
+* Mon Feb 11 2013 Markus Frosch <markus.frosch at netways.de> - 1.8.2-1
- bump to 1.8.2
* Wed Feb 06 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.1-3
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga-web.git
More information about the Pkg-nagios-changes
mailing list