[Pkg-nagios-changes] [pkg-icinga-web] 05/11: Use proper patches for configuration changes
Markus Frosch (old DM Account)
lazyfrosch-guest at moszumanska.debian.org
Tue Sep 9 13:02:08 UTC 2014
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-icinga-web.
commit c6cff5affeb687d9a0dd87b458f52444e23cd55c
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Tue Sep 9 13:44:21 2014 +0200
Use proper patches for configuration changes
---
debian/cronks.xml | 107 ------------------------------------
debian/databases.xml | 69 -----------------------
debian/icinga-web.install | 3 -
debian/module_reporting.xml | 22 --------
debian/patches/00_database_includes | 31 +++++++++++
debian/patches/01_disable_reporting | 34 ++++++++++++
debian/patches/02_docs_urls | 43 +++++++++++++++
debian/patches/series | 3 +
8 files changed, 111 insertions(+), 201 deletions(-)
diff --git a/debian/cronks.xml b/debian/cronks.xml
deleted file mode 100644
index 129bdfb..0000000
--- a/debian/cronks.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ae:configurations xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0" xmlns="http://icinga.org/cronks/config/parts/cronks/1.0">
- <ae:configuration>
- <cronks>
- <!--
- Cronk overwrites - for example
- -->
-
- <!--
- <cronk name="gridHostgroupSummary">
- <ae:parameter name="module">Cronks</ae:parameter>
- <ae:parameter name="action">System.ViewProc</ae:parameter>
- <ae:parameter name="hide">false</ae:parameter>
- <ae:parameter name="description">Display hostgroup summary</ae:parameter>
- <ae:parameter name="name">Hostgroups</ae:parameter>
- <ae:parameter name="categories">data</ae:parameter>
- <ae:parameter name="image">cronks.Dots</ae:parameter>
-
- <ae:parameter name="ae:parameter">
- <ae:parameter name="template">icinga-hostgroup-summary-template</ae:parameter>
- </ae:parameter>
- </cronk>
- -->
-
- <!-- Include other apps into icinga-web -->
- <!--
- <cronk name="demoTestUrlCronk">
- <ae:parameter name="module">Cronks</ae:parameter>
- <ae:parameter name="action">System.IframeView</ae:parameter>
- <ae:parameter name="hide">false</ae:parameter>
- <ae:parameter name="description">Demo URL integrationL</ae:parameter>
- <ae:parameter name="name">Demo URL integrationL</ae:parameter>
- <ae:parameter name="image">cronks.Ampersand</ae:parameter>
- <ae:parameter name="categories">misc</ae:parameter>
- <ae:parameter name="position">380</ae:parameter>
- <ae:parameter name="ae:parameter">
- <ae:parameter name="url"><![CDATA[https://www.icinga.org/blog/]]></ae:parameter>
- </ae:parameter>
- </cronk>
- -->
-
- <!-- set correct url for docs -->
- <cronk name="iframeViewIcingaDocsEn">
- <ae:parameter name="module">Cronks</ae:parameter>
- <ae:parameter name="action">System.IframeView</ae:parameter>
- <ae:parameter name="hide">false</ae:parameter>
- <ae:parameter name="description">Icinga docs english version</ae:parameter>
- <ae:parameter name="name">Docs EN</ae:parameter>
- <ae:parameter name="image">cronks.Info2</ae:parameter>
- <ae:parameter name="categories">misc</ae:parameter>
- <ae:parameter name="position">300</ae:parameter>
- <ae:parameter name="ae:parameter">
- <ae:parameter name="url"><![CDATA[/icinga-web/docs/en/index.html]]></ae:parameter>
- </ae:parameter>
- </cronk>
-
- <cronk name="iframeViewIcingaDocsDe">
- <ae:parameter name="module">Cronks</ae:parameter>
- <ae:parameter name="action">System.IframeView</ae:parameter>
- <ae:parameter name="hide">false</ae:parameter>
- <ae:parameter name="description">Icinga docs german version</ae:parameter>
- <ae:parameter name="name">Docs DE</ae:parameter>
- <ae:parameter name="image">cronks.Info2</ae:parameter>
- <ae:parameter name="categories">misc</ae:parameter>
- <ae:parameter name="position">310</ae:parameter>
- <ae:parameter name="ae:parameter">
- <ae:parameter name="url"><![CDATA[/icinga-web/docs/de/index.html]]></ae:parameter>
- </ae:parameter>
- </cronk>
-
- <!-- Disable default activated cronks -->
- <cronk name="icingaReportingDefault">
- <ae:parameter name="module">Reporting</ae:parameter>
- <ae:parameter name="action">Cronk.Main</ae:parameter>
-
- <ae:parameter name="hide">true</ae:parameter>
- <ae:parameter name="enabled">false</ae:parameter>
-
- <ae:parameter name="description">Seamless Jasper Integration</ae:parameter>
- <ae:parameter name="name">Reporting</ae:parameter>
- <ae:parameter name="categories">addons</ae:parameter>
- <ae:parameter name="image">cronks.Weather_Could_Sun</ae:parameter>
- <ae:parameter name="groupsonly">appkit_admin</ae:parameter>
- <ae:parameter name="ae:parameter">
- <ae:parameter name="jasperconfig">modules.reporting.jasperconfig.default</ae:parameter>
- <ae:parameter name="enable_onthefly">1</ae:parameter>
- <ae:parameter name="enable_repository">1</ae:parameter>
- <ae:parameter name="enable_scheduling">1</ae:parameter>
- </ae:parameter>
- </cronk>
-
- </cronks>
- <categories>
- <!--
- Category overwrites - for example:
- -->
- <!--
- <category name="misc">
- <ae:parameter name="title">Misc</ae:parameter>
- <ae:parameter name="visible">true</ae:parameter>
- <ae:parameter name="position">99</ae:parameter>
- </category>
-
- -->
- </categories>
- </ae:configuration>
-</ae:configurations>
diff --git a/debian/databases.xml b/debian/databases.xml
deleted file mode 100644
index b637730..0000000
--- a/debian/databases.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- databases.xml
- Defines which databases to use to store internal icinga-data and where to request icinga monitoring status from
-
- Have a look on app/config/databases.xml for configuration examples.
-
- http://docs.icinga.org/latest/de/icinga-web-config.html#configweb-databases
- https://wiki.icinga.org/display/howtos/databases.xml
--->
-
-
-<databases xmlns:db="http://agavi.org/agavi/config/parts/databases/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
-
- <db:database name="icinga_web" class="AppKitDoctrineDatabase">
- <!-- will be overridden by a include! -->
- <ae:parameter name="dsn">mysql://icinga_web:icinga_web@localhost:3306/icinga_web</ae:parameter>
-
- <ae:parameter name="charset">utf8</ae:parameter>
- <ae:parameter name="manager_attributes">
- <ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
- </ae:parameter>
-
- <ae:parameter name="load_models">%core.module_dir%/AppKit/lib/database/models/generated</ae:parameter>
- <ae:parameter name="models_directory">%core.module_dir%/AppKit/lib/database/models</ae:parameter>
- <ae:parameter name="date_format"><![CDATA[YYYY-MM-DD HH24:MI:SS]]></ae:parameter>
-
-
- <ae:parameter name="caching">
- <ae:parameter name="enabled">false</ae:parameter>
- <ae:parameter name="driver">apc</ae:parameter>
- <ae:parameter name="use_query_cache">true</ae:parameter>
- <ae:parameter name="use_result_cache">true</ae:parameter>
- <ae:parameter name="result_cache_lifespan">60</ae:parameter>
- </ae:parameter>
-
- </db:database>
-
- <!-- comment this if you do not want to use debconf with dbconfig-common -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="/etc/icinga-web/conf.d/database-web.xml#xpointer(databases/node())">
- <xi:fallback></xi:fallback>
- </xi:include>
-
- <db:database xmlns="http://agavi.org/agavi/config/parts/databases/1.0" name="icinga" class="IcingaDoctrineDatabase">
- <!-- will be overridden by a include! -->
- <ae:parameter name="dsn">mysql://icinga:icinga@localhost:3306/icinga</ae:parameter>
- <ae:parameter name="prefix">icinga_</ae:parameter>
- <ae:parameter name="charset">utf8</ae:parameter>
- <ae:parameter name="use_retained">true</ae:parameter>
- <ae:parameter name="date_format"><![CDATA[YYYY-MM-DD HH24:MI:SS]]></ae:parameter>
- <ae:parameter name="manager_attributes">
- <ae:parameter name="Doctrine_Core::ATTR_MODEL_LOADING">CONSERVATIVE</ae:parameter>
- </ae:parameter>
- <ae:parameter name="load_models">%core.module_dir%/Api/lib/database/models/generated</ae:parameter>
- <ae:parameter name="models_directory">%core.module_dir%/Api/lib/database/models</ae:parameter>
- <ae:parameter name="caching">
- <ae:parameter name="enabled">false</ae:parameter>
- <ae:parameter name="driver">apc</ae:parameter>
- <ae:parameter name="use_query_cache">true</ae:parameter>
- </ae:parameter>
- </db:database>
-
-
- <!-- comment this if you do not want to use debconf with dbconfig-common for the IDO database -->
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="/etc/icinga-web/conf.d/database-ido.xml#xpointer(databases/node())">
- <xi:fallback></xi:fallback>
- </xi:include>
-
-</databases>
diff --git a/debian/icinga-web.install b/debian/icinga-web.install
index 84ecb64..16cf072 100644
--- a/debian/icinga-web.install
+++ b/debian/icinga-web.install
@@ -2,9 +2,6 @@ etc/apache2/icinga-web.conf etc/icinga-web
etc/icinga-web/conf.d/* etc/icinga-web/conf.d
debian/database-ido.xml.tmpl usr/share/icinga-web/tmpl
debian/database-web.xml.tmpl usr/share/icinga-web/tmpl
-debian/databases.xml etc/icinga-web/conf.d
-debian/cronks.xml etc/icinga-web/conf.d
-debian/module_reporting.xml etc/icinga-web/conf.d
usr/share/icinga-web/app/* usr/share/icinga-web/app
usr/share/icinga-web/bin/clearcache.sh usr/lib/icinga-web/bin
diff --git a/debian/module_reporting.xml b/debian/module_reporting.xml
deleted file mode 100644
index e1d228f..0000000
--- a/debian/module_reporting.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ae:configurations xmlns="http://agavi.org/agavi/config/parts/module/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
- <ae:configuration>
-
- <!--
- Overwrite or append your reporting cronk configuration
- here
- -->
-
- <module enabled="false">
- <settings>
- <setting name="jasperconfig.default">
- <ae:parameter name="jasper_url">http://127.0.0.1:8080/jasperserver</ae:parameter>
- <ae:parameter name="jasper_user">jasperadmin</ae:parameter>
- <ae:parameter name="jasper_pass">jasperadmin</ae:parameter>
- <ae:parameter name="tree_root">/icinga/reports</ae:parameter>
- </setting>
- </settings>
- </module>
-
- </ae:configuration>
-</ae:configurations>
diff --git a/debian/patches/00_database_includes b/debian/patches/00_database_includes
new file mode 100644
index 0000000..f7347ee
--- /dev/null
+++ b/debian/patches/00_database_includes
@@ -0,0 +1,31 @@
+Description: Add XML includes for local database config
+Author: Markus Frosch <lazyfrosch at debian.org>
+Last-Update: 2014-09-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/conf.d/databases.xml.in
++++ b/etc/conf.d/databases.xml.in
+@@ -13,6 +13,11 @@
+ <databases xmlns:db="http://agavi.org/agavi/config/parts/databases/1.0" xmlns:ae="http://agavi.org/agavi/config/global/envelope/1.0">
+
+
++ <!-- comment this if you do not want to use debconf with dbconfig-common -->
++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="/etc/icinga-web/conf.d/database-web.xml#xpointer(databases/node())">
++ <xi:fallback></xi:fallback>
++ </xi:include>
++
+ <!--
+ Overwrite the icinga-web database (where users, roles, views, etc are stored
+ -->
+@@ -41,6 +46,11 @@
+ </db:database>
+ -->
+
++ <!-- comment this if you do not want to use debconf with dbconfig-common for the IDO database -->
++ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="/etc/icinga-web/conf.d/database-ido.xml#xpointer(databases/node())">
++ <xi:fallback></xi:fallback>
++ </xi:include>
++
+ <!--
+ Overwrite the default database conneciton for icinga data retrieval
+ Make sure to use IcingaDoctrineDatabase, otherwise the use_retained parameter will be ignored
diff --git a/debian/patches/01_disable_reporting b/debian/patches/01_disable_reporting
new file mode 100644
index 0000000..3afd1f9
--- /dev/null
+++ b/debian/patches/01_disable_reporting
@@ -0,0 +1,34 @@
+Description: Disable Icinga Reporting Cronk per default
+Author: Markus Frosch <lazyfrosch at debian.org>
+Last-Update: 2014-09-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/conf.d/cronks.xml
++++ b/etc/conf.d/cronks.xml
+@@ -40,7 +40,6 @@
+ -->
+
+ <!-- Disable default activated cronks -->
+- <!--
+ <cronk name="icingaReportingDefault">
+ <ae:parameter name="module">Reporting</ae:parameter>
+ <ae:parameter name="action">Cronk.Main</ae:parameter>
+@@ -60,7 +59,6 @@
+ <ae:parameter name="enable_scheduling">1</ae:parameter>
+ </ae:parameter>
+ </cronk>
+- -->
+
+ </cronks>
+ <categories>
+--- a/etc/conf.d/module_reporting.xml
++++ b/etc/conf.d/module_reporting.xml
+@@ -7,7 +7,7 @@
+ here
+ -->
+
+- <module enabled="true">
++ <module enabled="false">
+ <settings>
+ <setting name="jasperconfig.default">
+ <ae:parameter name="jasper_url">http://127.0.0.1:8080/jasperserver</ae:parameter>
diff --git a/debian/patches/02_docs_urls b/debian/patches/02_docs_urls
new file mode 100644
index 0000000..a78eb73
--- /dev/null
+++ b/debian/patches/02_docs_urls
@@ -0,0 +1,43 @@
+Description: Set correct URLs for Icinga Docs
+Author: Markus Frosch <lazyfrosch at debian.org>
+Last-Update: 2014-09-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/etc/conf.d/cronks.xml
++++ b/etc/conf.d/cronks.xml
+@@ -39,6 +39,35 @@
+ </cronk>
+ -->
+
++ <!-- set correct url for docs -->
++ <cronk name="iframeViewIcingaDocsEn">
++ <ae:parameter name="module">Cronks</ae:parameter>
++ <ae:parameter name="action">System.IframeView</ae:parameter>
++ <ae:parameter name="hide">false</ae:parameter>
++ <ae:parameter name="description">Icinga docs english version</ae:parameter>
++ <ae:parameter name="name">Docs EN</ae:parameter>
++ <ae:parameter name="image">cronks.Info2</ae:parameter>
++ <ae:parameter name="categories">misc</ae:parameter>
++ <ae:parameter name="position">300</ae:parameter>
++ <ae:parameter name="ae:parameter">
++ <ae:parameter name="url"><![CDATA[/icinga-web/docs/en/index.html]]></ae:parameter>
++ </ae:parameter>
++ </cronk>
++
++ <cronk name="iframeViewIcingaDocsDe">
++ <ae:parameter name="module">Cronks</ae:parameter>
++ <ae:parameter name="action">System.IframeView</ae:parameter>
++ <ae:parameter name="hide">false</ae:parameter>
++ <ae:parameter name="description">Icinga docs german version</ae:parameter>
++ <ae:parameter name="name">Docs DE</ae:parameter>
++ <ae:parameter name="image">cronks.Info2</ae:parameter>
++ <ae:parameter name="categories">misc</ae:parameter>
++ <ae:parameter name="position">310</ae:parameter>
++ <ae:parameter name="ae:parameter">
++ <ae:parameter name="url"><![CDATA[/icinga-web/docs/de/index.html]]></ae:parameter>
++ </ae:parameter>
++ </cronk>
++
+ <!-- Disable default activated cronks -->
+ <cronk name="icingaReportingDefault">
+ <ae:parameter name="module">Reporting</ae:parameter>
diff --git a/debian/patches/series b/debian/patches/series
index c9da1ed..a75772b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,4 @@
+00_database_includes
+01_disable_reporting
+02_docs_urls
11_lintian_confusion
--
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