[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.8.3-1-32-g1d1a585
Markus Frosch
markus at lazyfrosch.de
Wed May 8 14:57:59 UTC 2013
The following commit has been merged in the master branch:
commit 664cf6976ae42d42c2cacae34805154c0d876282
Merge: a4deff6d53b33960fab9822f0485c17854dd9316 d748c06f702a502082b895f3cc10d5bc2ffb36dd
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Wed May 8 16:23:42 2013 +0200
Merge branch 'wheezy'
Conflicts:
debian/changelog
debian/gbp.conf
debian/icinga-web.README.Debian
debian/patches/series
diff --combined debian/changelog
index e6e5c1b,d8248c4..fb10ff9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,82 -1,34 +1,113 @@@
+icinga-web (1.9.0-1) UNRELEASED; urgency=low
+
+ * [e8ce6b5] Imported Upstream version 1.9.0
+ * [3535d71] added database schema for 1.9.0
+ * [435cae2] switched to Apache2 configuration coming from upstream
+ * [020f7f4] Switched to new build prefix and updated paths in install
+
+ -- Markus Frosch <markus at lazyfrosch.de> Wed, 08 May 2013 16:03:39 +0200
+
+icinga-web (1.8.3-1) experimental; urgency=low
+
+ * [bba67b0] Removing own symlinks to nagios-images.
+ The links are now provided by nagios-images itself
+ * [4aa93b9] Imported Upstream version 1.8.3
+ * [1e1e363] Debian package updates for 1.8.3
+
+ -- Markus Frosch <markus at lazyfrosch.de> Mon, 25 Mar 2013 16:41:30 +0100
+
+icinga-web (1.8.2-1) experimental; urgency=low
+
+ * [5a03f8a] bump standards version
+ * [14c51bc] Imported Upstream version 1.8.2
+ * [e80aa3c] Updated module_reporting.xml to match upstream
+ * [f97dab8] remove deprecated soap interface
+
+ -- Markus Frosch <markus at lazyfrosch.de> Tue, 12 Feb 2013 17:48:09 +0100
+
+icinga-web (1.8.1-1) experimental; urgency=low
+
+ * [5f0e216] Debconf language update for ja (Japanese)
+ Thanks to victory (Closes: #693061)
+ * [aede6fb] changed root password update
+ the password now will only be set after it
+ has been changed via dpkg-reconfigure
+ * [3e161a1] updated templates for new password behavior
+ * [74b5d9b] password update now via flag, not a extra template
+ * [f17211e] Imported Upstream version 1.8.1
+ * [2f1cc10] Updates for upstream 1.8.1
+ * [b6c0d4c] added README.source
+
+ -- Markus Frosch <markus at lazyfrosch.de> Mon, 6 Dec 2012 19:07:11 +0100
+
+icinga-web (1.8.0-1) experimental; urgency=low
+
+ * [265f0d7] Imported Upstream version 1.8.0~beta
+ * [7739702] updated watch file for dfsg tarballs
+ * [1dbaec2] updated rules for 1.8.0 (CHANGELOG + DB)
+ * [9da2d75] added gbp.conf
+ * [b72c159] added reference to icinga-idoutils to README
+ * [4719f36] patch 10_db_version_fix no longer needed for 1.8.0
+ * [fe9868e] patch 20_pgsql_statusquery_fix is now upstream
+ * [dc543c0] add build-dependencies php5-cli and php5-xsl
+ * [98e0f8b] more rules changes
+ * [02e787f] Imported Upstream version 1.8.0
+
+ -- Markus Frosch <markus at lazyfrosch.de> Thu, 18 Oct 2012 21:46:24 +0200
+
+icinga-web (1.7.2-1) experimental; urgency=low
+
+ * [acc4449] optimized apache2.conf
+ some regexp stuff, cleanup and comments
+ * [45f3cb4] Imported Upstream version 1.7.2
+ * [f5b5dcc] removed patch 20_squishloader_gzip_off
+ now upstream in 1.7.2
+ * [6a24d99] updated patch 10_db_version_fix for Jessie
+ * [6e3850c] apache2.conf - avoid usage of submatching patterns
+ (Closes: #683126)
+ * [380ebed] integrating icinga-doc as suggested package
+ (Closes: #692358)
+ * [1647481] added patch 20_pgsql_statusquery_fix
+ * [1c7099f] added a cache path for reporting.
+ Thanks to Oskar Liljeblad for suggesting it
+ (Closes: 686336)
+ * [a4a206f] integrated nagios-images, via symlinks and suggest
+ * [ca8d3bc] some cleanup for lintian
+ * [81e0670] removed unneeded quilt dependency
+
+ -- Markus Frosch <markus at lazyfrosch.de> Mon, 14 Sep 2012 17:56:05 +0200
+
+ icinga-web (1.7.1+dfsg2-6) unstable; urgency=high
+
+ * [bb01a46] Security fix for a YUI library issue
+
+ Two .swf files has been removed from the Debian package
+ and the Flash supported chart feature is disable for now.
+
+ In addition a upstream patch was applied to allow the user
+ to use the feature with a newer .swf resource if he wants
+ to.
+
+ Please see README.Debian for instructions
+
+ Closes: #694262
+ Closes: #694641
+
+ * [4ec39a9] DFSG cleaned upstream 1.7.1+dfsg2
+ SWF binary files has been removed from tarball
+
+ -- Markus Frosch <markus at lazyfrosch.de> Wed, 29 Nov 2012 00:17:41 +0100
+
+ icinga-web (1.7.1+dfsg1-5) unstable; urgency=high
+
+ * [4cc829d] DFSG cleaned upstream 1.7.1+dfsg1
+ Removed JSmin from upstream tarball
+ due to non-free license Closes: #689764
+ * [795fde4] added gbp.conf for wheezy branch
+ * [bca5fb8] updated watch file for dfsg tarballs
+
+ -- Markus Frosch <markus at lazyfrosch.de> Mon, 08 Oct 2012 14:52:10 +0200
+
icinga-web (1.7.1-4) unstable; urgency=low
* [3b184da] fixed postrm to avoid breaking on
diff --combined debian/gbp.conf
index 40d8db7,13a7451..1d43e52
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,4 -1,3 +1,5 @@@
[DEFAULT]
-debian-branch = wheezy
-upstream-branch = upstream_1.7.1_dfsg
+;debian-branch = master
+;upstream-branch = upstream
++upstream-branch = upstream_dfsg
+pristine-tar = True
diff --combined debian/icinga-web.README.Debian
index fb62de9,0000000..935b774
mode 100644,000000..100644
--- a/debian/icinga-web.README.Debian
+++ b/debian/icinga-web.README.Debian
@@@ -1,59 -1,0 +1,90 @@@
+icinga-web for Debian
+=====================
+
+Notes:
+
++ * [Security Information]
++ The Yahoo Interface library is used in Icinga Web to render certain
++ pie charts, unfortunatly this causes problems due to a cross site
++ scripting issue.
++
++ The flash component has been removed from Debian and the charting
++ feature is disabled.
++
++ Though a upstream fix is applied to allow the usage - when the user
++ decides to...
++
++ If you want to use the TO charts you have to either download a .swf
++ file to your server or use a swf loaded from yahooapis.com on demand.
++
++ See the file /usr/share/icinga-web/app/modules/AppKit/lib/js/AppKit.js
++ for configuration options.
++
++ Remote files:
++ uncomment the respective lines there and run
++ /usr/lib/icinga-web/bin/clearcache.sh
++
++ Local files:
++ download both files
++ http://yui.yahooapis.com/2.8.2/build/charts/assets/charts.swf
++ http://swfobject.googlecode.com/svn/trunk/swfobject/expressInstall.swf
++
++ and store them in /usr/share/icinga-web/lib/ext3/resources/
++
++ make sure to also change AppKit.js to uncomment the respective lines and
++ run /usr/lib/icinga-web/bin/clearcache.sh
++
+ * Please also read /usr/share/doc/icinga-idoutils/README.Debian
+ this file will explain how to enable the IDO in the first place
+
+ * Supported databases are: MySQL and PostgreSQL (by auto configuration)
+
+ * PostgreSQL with ident authentication:
+
+ This is not really supported, just because icinga-web runs as www-data
+ per default. You will have to do some configuration stuff to run
+ icinga-web with ident. But you'll have to do this on your own.
+
+ Though the maintainer scripts will create you a config for the
+ socket connection.
+
+ Every access rights the maintainer script changes is checked
+ against dpkg-statoverride - so make sure to use it.
+
+ * Icinga Web uses two database connections
+
+ 1) IDO database, which is configured with by a dependency
+ on the icinga-idoutils packet
+
+ generated file: /etc/icinga-web/conf.d/database-ido.xml
+
+ 2) Icinga Web database, which stores users and settings and
+ is configured by using the dbconfig-common system and debconf
+
+ generated file: /etc/icinga-web/conf.d/database-web.xml
+
+ * If you want to to use different database connection settings
+ modify the file
+ /etc/icinga-web/conf.d/databases.xml
+ and comment the includes of the auto generated xml files
+
+ * Jasper Reporting is disabled by default
+ to activate it you have to edit:
+
+ /etc/icinga-web/conf.d/cronks.xml
+ comment out the xml node <cronk name="icingaReportingDefault">
+
+ /etc/icinga-web/conf.d/module_reporting.xml
+ set <module enabled="true">
+ and change the url and user/pass to fit your jasper instance
+
+ Please see the Icinga Wiki for more information.
+
+ * If you change any configuration or code file of Icinga Web
+ it is necessary to clear the cache.
+
+ To achieve this run this command as root:
+ /usr/lib/icinga-web/bin/clearcache.sh
+
- -- Markus Frosch <markus at lazyfrosch.de> Sat, 13 Oct 2012 14:45:35 +0200
++ -- Markus Frosch <markus at lazyfrosch.de> Wed, 8 May 2013 16:22:41 +0200
+
diff --combined debian/patches/series
index e69de29,7a8602a..e51961e
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,0 -1,3 +1,1 @@@
-10_db_version_fix
-20_squishloader_gzip_off
+ 21_yui_chartsswf
--
Debian packaging of icinga-web
More information about the Pkg-nagios-changes
mailing list