tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-24 06:05:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward-port packaging changes from Debian's pkg-icinga2 repository

Browse Source 
refs #8103
This commit is contained in:
Gunnar Beutner 2014-12-18 06:12:26 +01:00
parent af8aaf5bad
commit a3a6c4d02b
18 changed files with 271 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/classicui/apache2.conf vendored
View File

@ -3,26 +3,29 @@
ScriptAlias /cgi-bin/icinga2-classicui /usr/lib/cgi-bin/icinga2-classicui ScriptAlias /cgi-bin/icinga2-classicui /usr/lib/cgi-bin/icinga2-classicui
# Where the stylesheets (config files) reside # Where the stylesheets (config files) reside
Alias /icinga2-classicui/stylesheets /etc/icinga2/classicui/stylesheets Alias /icinga2-classicui/stylesheets /etc/icinga2-classicui/stylesheets
# Where the HTML pages live # Where the HTML pages live
Alias /icinga2-classicui /usr/share/icinga2/classicui Alias /icinga2-classicui /usr/share/icinga2/classicui
<LocationMatch "^/cgi-bin/icinga2-classicui"> <LocationMatch "^/cgi-bin/icinga2-classicui">
SetEnv ICINGA_CGI_CONFIG /etc/icinga2/classicui/cgi.cfg SetEnv ICINGA_CGI_CONFIG /etc/icinga2-classicui/cgi.cfg
</LocationMatch> </LocationMatch>
<DirectoryMatch "^(?:/usr/share/icinga2/classicui/htdocs|/usr/lib/cgi-bin/icinga2-classicui|/etc/icinga2/classicui/stylesheets)/"> <DirectoryMatch "^(?:/usr/share/icinga2/classicui/htdocs|/usr/lib/cgi-bin/icinga2-classicui|/etc/icinga2-classicui/stylesheets)/">
Options FollowSymLinks Options FollowSymLinks
DirectoryIndex index.html DirectoryIndex index.html
AllowOverride AuthConfig AllowOverride AuthConfig
Order Allow,Deny
Allow From All <IfVersion < 2.3>
Order Allow,Deny
Allow From All
</IfVersion>
AuthName "Icinga Access" AuthName "Icinga Access"
AuthType Basic AuthType Basic
AuthUserFile /etc/icinga2/classicui/htpasswd.users AuthUserFile /etc/icinga2-classicui/htpasswd.users
Require valid-user Require valid-user
</DirectoryMatch> </DirectoryMatch>

242
debian/control vendored
View File

@ -2,12 +2,13 @@ Source: icinga2
Section: admin Section: admin
Priority: extra Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org> Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
Uploaders: Markus Frosch <markus@lazyfrosch.de>, Uploaders: Markus Frosch <lazyfrosch@debian.org>,
Jan Wagner <waja@cyconet.org>, Jan Wagner <waja@cyconet.org>,
Alexander Wirt <formorer@debian.org> Alexander Wirt <formorer@debian.org>
Build-Depends: bison, Build-Depends: bison,
cmake (>= 2.8.7), cmake (>= 2.8.7),
debhelper (>= 9), debhelper (>= 9),
dh-systemd (>= 1.5),
flex, flex,
g++ (>= 1.96), g++ (>= 1.96),
libboost-dev, libboost-dev,
@ -23,8 +24,10 @@ Build-Depends: bison,
libreadline-dev, libreadline-dev,
make (>= 3.81), make (>= 3.81),
po-debconf po-debconf
Standards-Version: 3.9.5 Standards-Version: 3.9.6
Homepage: http://www.icinga.org Homepage: http://www.icinga.org
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-nagios/pkg-icinga2.git
Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-icinga2.git
Package: icinga2 Package: icinga2
Architecture: any Architecture: any
@ -33,45 +36,49 @@ Depends: icinga2-bin (= ${binary:Version}),
${misc:Depends} ${misc:Depends}
Recommends: icinga2-doc, monitoring-plugins-basic | nagios-plugins-basic Recommends: icinga2-doc, monitoring-plugins-basic | nagios-plugins-basic
Description: host and network monitoring system Description: host and network monitoring system
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This is the metapackage to install all Icinga 2 features. This is the metapackage to install all Icinga 2 features.
Package: icinga2-common Package: icinga2-common
Architecture: all Architecture: all
Depends: adduser, lsb-release, ${misc:Depends} Replaces: python-icinga2
Conflicts: python-icinga2
Provides: python-icinga2
Depends:
adduser,
lsb-release,
${misc:Depends}
Description: host and network monitoring system - common files Description: host and network monitoring system - common files
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides configuration and some basic helper scripts. This package provides configuration and some basic helper scripts.
@ -82,22 +89,21 @@ Depends: icinga2-common (= ${source:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Description: host and network monitoring system - daemon Description: host and network monitoring system - daemon
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides the Icinga 2 daemon. This package provides the Icinga 2 daemon.
@ -106,51 +112,50 @@ Architecture: all
Section: doc Section: doc
Depends: ${misc:Depends} Depends: ${misc:Depends}
Description: host and network monitoring system - documentation Description: host and network monitoring system - documentation
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides the Icinga 2 documentation. This package provides the Icinga 2 documentation.
Package: icinga2-classicui Package: icinga2-classicui
Architecture: all Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2)
Depends: apache2-utils, Depends: apache2-utils,
icinga-cgi-bin (>= 1.11.5~), icinga-cgi-bin (>= 1.11.5~),
icinga2-common (= ${source:Version}), icinga2-common (= ${source:Version}),
${misc:Depends} ${misc:Depends}
Recommends: apache2 | httpd Recommends: apache2 | httpd
Description: host and network monitoring system - classic ui integration Description: host and network monitoring system - classic UI
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see monitoring-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides the integration into Icinga Classic UI. This package provides support for the Icinga Classic User Interface.
Package: icinga2-ido-mysql Package: icinga2-ido-mysql
Architecture: any Architecture: any
@ -164,23 +169,22 @@ Depends: dbconfig-common,
${shlibs:Depends} ${shlibs:Depends}
Recommends: mysql-client Recommends: mysql-client
Suggests: mysql-server Suggests: mysql-server
Description: host and network monitoring system - IDO for MySQL Description: host and network monitoring system - MySQL support
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides the IDO module for the MySQL database. This package provides the IDO module for the MySQL database.
@ -196,48 +200,44 @@ Depends: dbconfig-common,
${shlibs:Depends} ${shlibs:Depends}
Recommends: postgresql-client Recommends: postgresql-client
Suggests: postgresql Suggests: postgresql
Description: host and network monitoring system - IDO for PostgreSQL Description: host and network monitoring system - PostgreSQL support
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides the IDO module for the PostgreSQL database. This package provides the IDO module for the PostgreSQL database.
Package: icinga2-dbg Package: icinga2-dbg
Architecture: any Architecture: any
Section: debug Section: debug
Priority: extra
Depends: icinga2-bin (= ${binary:Version}), ${misc:Depends} Depends: icinga2-bin (= ${binary:Version}), ${misc:Depends}
Description: host and network monitoring system - debug symbols Description: host and network monitoring system - debug symbols
Icinga 2 is a general-purpose monitoring application and the next generation Icinga 2 is a general-purpose monitoring application to fit the needs of
after Icinga 1.x - which was a Nagios fork. It should fit the needs of a small any size of network. Icinga 1.x was a Nagios fork; this new generation
environment as well as big installations. has been rewritten from scratch in C++, with multi-threading and cluster
. support.
Rewritten from scratch in C++, with multi-threading and cluster support.
. .
Features: Features:
* All common features of Icinga and Nagios * all standard features of Icinga and Nagios;
* Much faster and more scalable than Icinga 1 and Nagios * much faster and more scalable than Icinga 1 and Nagios;
* New configuration format, more intuitive and template based * new, more intuitive, template-based configuration format;
* Monitoring several services by executing checks (see nagios-plugins*) * monitoring services on ICMP (ping) or TCP ports (HTTP, NNTP, POP3,
for example ICMP/ping, SMTP, POP3, HTTP, NNTP, or other TCP port SMTP, etc.) by executing checks (see monitoring-plugins*);
* Any small script can be used as a check plugin, when following the Nagios * any small script following the Nagios plugin API can be used as a
plugin API check plugin;
* Notifications about alerts with any custom script, or shipped examples * notifications about alerts for any custom script (with examples);
* Native support for Livestatus and Graphite * native support for Livestatus and Graphite.
. .
This package provides debug symbols for Icinga 2. This package provides debug symbols for Icinga 2.

39
debian/copyright vendored
View File

@ -33,8 +33,8 @@ License: GPL-2+-with-exception
also delete it here. also delete it here.
Files: debian/* Files: debian/*
Copyright: 2012 Alexander Wirt <formorer@debian.org> Copyright: 2012-2014 Alexander Wirt <formorer@debian.org>
2013-2014 Markus Frosch <markus@lazyfrosch.de> 2013-2014 Markus Frosch <lazyfrosch@debian.org>
2014 Icinga Development Team (http://www.icinga.org) 2014 Icinga Development Team (http://www.icinga.org)
License: GPL-2+ License: GPL-2+
This package is free software; you can redistribute it and/or modify This package is free software; you can redistribute it and/or modify
@ -50,21 +50,6 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: third-party/yajl/*
Copyright: 2007-2014 Lloyd Hilaiel <me@lloyd.io>
License: ISC
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Files: third-party/execvpe/* Files: third-party/execvpe/*
Copyright: 1991,92, 1995-99, 2002, 2004, 2005, 2007, 2009 Free Software Foundation, Inc. Copyright: 1991,92, 1995-99, 2002, 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
License: LGPL-2.1+ License: LGPL-2.1+
@ -96,7 +81,7 @@ License: GPL-1+
GNU General Public License for more details. GNU General Public License for more details.
. .
On Debian systems, the complete text of the GNU General On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-1". Public License version 1 can be found in "/usr/share/common-licenses/GPL-1".
Files: third-party/cmake/BoostTestTargets.* Files: third-party/cmake/BoostTestTargets.*
third-party/cmake/CopyResourcesToBuildTree.cmake third-party/cmake/CopyResourcesToBuildTree.cmake
@ -104,7 +89,7 @@ Files: third-party/cmake/BoostTestTargets.*
third-party/cmake/GetGitRevisionDescription.cmake.in third-party/cmake/GetGitRevisionDescription.cmake.in
Copyright: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net> Copyright: 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
2009-2010 Iowa State University 2009-2010 Iowa State University
License: Boost Software License 1.0 License: Boost-Software-License-1.0
Permission is hereby granted, free of charge, to any person or organization Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute, this license (the "Software") to use, reproduce, display, distribute,
@ -234,3 +219,19 @@ License: BSD-3-clause
This software is distributed WITHOUT ANY WARRANTY; without even the This software is distributed WITHOUT ANY WARRANTY; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information. See the License for more information.
Files: third-party/yajl/*
Copyright: 2007-2014 Lloyd Hilaiel <me@lloyd.io>
License: ISC
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

2
debian/icinga2-bin.lintian-overrides vendored
View File

@ -1,2 +1,2 @@
# this is actually a defined word in the livestatus protocol... # this is actually a defined word in the livestatus protocol...
spelling-error-in-binary usr/lib/x86_64-linux-gnu/icinga2/liblivestatus-0.so.0.0.3 childs children spelling-error-in-binary usr/lib/*/icinga2/liblivestatus.so childs children

1
debian/icinga2-classicui.dirs vendored
View File

@ -1 +1,2 @@
usr/share/icinga2/classicui usr/share/icinga2/classicui
etc/icinga2-classicui

4
debian/icinga2-classicui.install vendored
View File

@ -1,4 +1,4 @@
debian/classicui/*.html usr/share/icinga2/classicui debian/classicui/*.html usr/share/icinga2/classicui
debian/classicui/*.js usr/share/icinga2/classicui debian/classicui/*.js usr/share/icinga2/classicui
debian/classicui/apache2.conf etc/icinga2/classicui debian/classicui/apache2.conf etc/icinga2-classicui
debian/classicui/cgi.cfg etc/icinga2/classicui debian/classicui/cgi.cfg etc/icinga2-classicui

4
debian/icinga2-classicui.links vendored
View File

@ -1,5 +1,5 @@
etc/icinga/stylesheets etc/icinga2/classicui/stylesheets etc/icinga/stylesheets etc/icinga2-classicui/stylesheets
etc/icinga2/classicui/apache2.conf etc/apache2/conf-available/icinga2-classicui.conf etc/icinga2-classicui/apache2.conf etc/apache2/conf-available/icinga2-classicui.conf
usr/lib/cgi-bin/icinga usr/lib/cgi-bin/icinga2-classicui usr/lib/cgi-bin/icinga usr/lib/cgi-bin/icinga2-classicui
#usr/share/icinga/htdocs/docs usr/share/icinga2/classicui/docs #usr/share/icinga/htdocs/docs usr/share/icinga2/classicui/docs
usr/share/icinga/htdocs/images usr/share/icinga2/classicui/images usr/share/icinga/htdocs/images usr/share/icinga2/classicui/images

24
debian/icinga2-classicui.postinst vendored
View File

@ -6,7 +6,7 @@ set -e
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
# shorthand # shorthand
en="/etc/icinga2/classicui" en="/etc/icinga2-classicui"
# location of the default apache configuration for icinga # location of the default apache configuration for icinga
apacheconf=$en/apache2.conf apacheconf=$en/apache2.conf
@ -49,6 +49,21 @@ case "$1" in
configure) configure)
enable_features_for_classic $@ enable_features_for_classic $@
dpkg-maintscript-helper mv_conffile \
/etc/icinga2/classicui/apache2.conf \
/etc/icinga2-classicui/apache2.conf 2.2.0-1~ icinga2-classicui -- "$@"
dpkg-maintscript-helper mv_conffile /etc/icinga2/classicui/cgi.cfg \
/etc/icinga2-classicui/cgi.cfg 2.2.0-1~ icinga2-classicui -- "$@"
if [ -f '/etc/icinga2/classicui/htpasswd.users' ] && [ ! -f '/etc/icinga2-classicui/htpasswd.users' ];
then
echo "Move classicui password file to new location"
mv -f /etc/icinga2/classicui/htpasswd.users \
/etc/icinga2-classicui/htpasswd.users
rmdir /etc/icinga2/classicui || true
fi
echo "enabling Apache2 config..." echo "enabling Apache2 config..."
COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true) COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
@ -63,12 +78,15 @@ case "$1" in
elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
a2enmod cgi a2enmod cgi
# create symlink if not existing # create symlink if not existing
[ -f /etc/apache2/conf.d/icinga2-classicui.conf ] || ln -vs ../../icinga2/classicui/apache2.conf /etc/apache2/conf.d/icinga2-classicui.conf [ -e /etc/apache2/conf.d/icinga2-classicui.conf ] || ln -vs $en/apache2.conf /etc/apache2/conf.d/icinga2-classicui.conf
# reload webserver # reload webserver
[ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload
fi fi
# check for an old symlink to the stylesheets
test -L /etc/icinga2/classicui/stylesheets && rm \
/etc/icinga2/classicui/stylesheets && rmdir /etc/icinga2/classicui || true
### ###
# Admin password # Admin password
### ###
@ -84,8 +102,10 @@ case "$1" in
if [ -n "$admpass" ]; then if [ -n "$admpass" ]; then
#unfortunatly that method only works with 2.4 #unfortunatly that method only works with 2.4
if htpasswd 2>&1 | grep -q ' -i'; then if htpasswd 2>&1 | grep -q ' -i'; then
echo "$admpass to $htpw"
echo "$admpass" | htpasswd -i "$htpw" icingaadmin echo "$admpass" | htpasswd -i "$htpw" icingaadmin
else else
echo "$admpass to $htpw"
htpasswd -b "$htpw" icingaadmin "$admpass" htpasswd -b "$htpw" icingaadmin "$admpass"
fi fi
fi fi

8
debian/icinga2-classicui.postrm vendored
View File

@ -4,7 +4,7 @@
set -e set -e
# shorthand # shorthand
en="/etc/icinga2/classicui" en="/etc/icinga2-classicui"
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule
@ -31,6 +31,12 @@ case "$1" in
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
disable_apache2 "$@" disable_apache2 "$@"
dpkg-maintscript-helper mv_conffile \
/etc/icinga2/classicui/apache2.conf \
/etc/icinga2-classicui/apache2.conf 2.2.0-1~ icinga2-classicui -- "$@"
dpkg-maintscript-helper mv_conffile /etc/icinga2/classicui/cgi.cfg \
/etc/icinga2-classicui/cgi.cfg 2.2.0-1~ icinga2-classicui -- "$@"
;; ;;

4
debian/icinga2-common.install vendored
View File

@ -1,6 +1,8 @@
debian/config/apt.conf etc/icinga2/conf.d debian/config/apt.conf etc/icinga2/conf.d
debian/tmp/etc/icinga2 debian/tmp/etc/icinga2
debian/tmp/etc/logrotate.d debian/tmp/etc/logrotate.d
debian/tmp/etc/bash_completion.d
tools/syntax/* usr/share/icinga2-common/syntax tools/syntax/* usr/share/icinga2-common/syntax
usr/share/icinga2 usr/share/icinga2
debian/tmp/etc/bash_completion.d
etc/sysconfig/icinga2 usr/lib/icinga2
usr/lib/icinga2/prepare-dirs

14
debian/icinga2-common.postinst vendored
View File

@ -24,16 +24,6 @@ is_fresh_install()
return 1 return 1
} }
enable_default_features() {
FIX_VERSION="0.0.5+icingasnap201312070000"
if is_fresh_install $@ \
|| dpkg --compare-versions "$2" lt "$FIX_VERSION"; then
echo "enabling default icinga2 features"
icinga2 feature enable checker notification mainlog
fi
# handle new default features here in the future
}
case "$1" in case "$1" in
configure) configure)
if ! getent passwd nagios > /dev/null ; then if ! getent passwd nagios > /dev/null ; then
@ -44,7 +34,7 @@ case "$1" in
# explicitly set permissions on some files that are dependent # explicitly set permissions on some files that are dependent
# on the uid/gid of the nagios user, which is dynamically created. # on the uid/gid of the nagios user, which is dynamically created.
setperm nagios nagios 0750 /etc/icinga2 setperm nagios nagios 0750 /etc/icinga2
setperm nagios adm 2751 /var/log/icinga2 setperm nagios adm 2751 /var/log/icinga2
setperm nagios adm 2751 /var/log/icinga2/compat setperm nagios adm 2751 /var/log/icinga2/compat
@ -62,8 +52,6 @@ case "$1" in
setperm nagios nagios 0750 /var/spool/icinga2/perfdata setperm nagios nagios 0750 /var/spool/icinga2/perfdata
setperm nagios nagios 0750 /var/spool/icinga2/tmp setperm nagios nagios 0750 /var/spool/icinga2/tmp
# enable default features
enable_default_features $@
;; ;;
abort-upgrade|abort-remove|abort-deconfigure) abort-upgrade|abort-remove|abort-deconfigure)

3
debian/icinga2-common.postrm vendored
View File

@ -5,9 +5,6 @@ set -e
case "$1" in case "$1" in
purge) purge)
for f in /etc/icinga2/features-enabled/*; do
[ -L "$f" ] && rm -f "$f"
done
rm -rf /var/lib/icinga2/ rm -rf /var/lib/icinga2/
rm -rf /var/log/icinga2/ rm -rf /var/log/icinga2/
rm -rf /var/cache/icinga2/ rm -rf /var/cache/icinga2/

18
debian/icinga2-ido-mysql.templates vendored
View File

@ -1,9 +1,17 @@
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english@lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: icinga2-ido-mysql/enable Template: icinga2-ido-mysql/enable
Type: boolean Type: boolean
Default: true Default: true
_Description: Enable icinga 2 mysql idoutils? _Description: Enable Icinga 2's ido-mysql feature?
If you acknowledge this question the ido mysql Please specify whether Icinga 2 should use MySQL.
feature gets enabled for icinga 2.
. .
If you want to disable the feature call You may later disable the feature by using the
icinga2 feature disable ido-mysql "icinga2 feature disable ido-mysql" command.

2
debian/icinga2-ido-pgsql.postinst vendored
View File

@ -29,7 +29,7 @@ if [ "$1" = configure ]; then
if [ ! -L /etc/icinga2/features-enabled/ido-pgsql.conf ] if [ ! -L /etc/icinga2/features-enabled/ido-pgsql.conf ]
then then
echo "enable ido pgsql feature" echo "enable ido pgsql feature"
icinga2 feature enable ido-pgsql icinga2 feature disable ido-pgsql
echo "reloading icinga2" echo "reloading icinga2"
[ -x $(which invoke-rc.d) ] && invoke-rc.d icinga2 reload [ -x $(which invoke-rc.d) ] && invoke-rc.d icinga2 reload

18
debian/icinga2-ido-pgsql.templates vendored
View File

@ -1,9 +1,17 @@
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english@lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: icinga2-ido-pgsql/enable Template: icinga2-ido-pgsql/enable
Type: boolean Type: boolean
Default: true Default: true
_Description: Enable icinga 2 pgsql idoutils? _Description: Enable Icinga 2's ido-pgsql feature?
If you acknowledge this question the ido pgsql Please specify whether Icinga 2 should use PostgreSQL.
feature gets enabled for icinga 2.
. .
If you want to disable the feature call You may later disable the feature by using the
icinga2 feature disable ido-pgsql "icinga2 feature disable ido-pgsql" command.

2
debian/po/POTFILES.in vendored
View File

@ -1 +1,3 @@
[type: gettext/rfc822deb] icinga2-classicui.templates [type: gettext/rfc822deb] icinga2-classicui.templates
[type: gettext/rfc822deb] icinga2-ido-mysql.templates
[type: gettext/rfc822deb] icinga2-ido-pgsql.templates

42
debian/po/templates.pot vendored
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: icinga2\n" "Project-Id-Version: icinga2\n"
"Report-Msgid-Bugs-To: icinga2@packages.debian.org\n" "Report-Msgid-Bugs-To: icinga2@packages.debian.org\n"
"POT-Creation-Date: 2013-10-22 14:29+0200\n" "POT-Creation-Date: 2014-08-18 15:18+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -64,3 +64,43 @@ msgstr ""
#: ../icinga2-classicui.templates:4001 #: ../icinga2-classicui.templates:4001
msgid "The two passwords you entered were not the same. Please try again." msgid "The two passwords you entered were not the same. Please try again."
msgstr "" msgstr ""
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
msgid "Enable Icinga 2's ido-mysql feature?"
msgstr ""
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
msgid "Please specify whether Icinga 2 should use MySQL."
msgstr ""
#. Type: boolean
#. Description
#: ../icinga2-ido-mysql.templates:2001
msgid ""
"You may later disable the feature by using the \"icinga2 feature disable ido-"
"mysql\" command."
msgstr ""
#. Type: boolean
#. Description
#: ../icinga2-ido-pgsql.templates:2001
msgid "Enable Icinga 2's ido-pgsql feature?"
msgstr ""
#. Type: boolean
#. Description
#: ../icinga2-ido-pgsql.templates:2001
msgid "Please specify whether Icinga 2 should use PostgreSQL."
msgstr ""
#. Type: boolean
#. Description
#: ../icinga2-ido-pgsql.templates:2001
msgid ""
"You may later disable the feature by using the \"icinga2 feature disable ido-"
"pgsql\" command."
msgstr ""

17
debian/rules vendored
View File

@ -3,7 +3,10 @@
#export DH_VERBOSE=1 #export DH_VERBOSE=1
%: %:
dh $@ dh $@ --with systemd
override_dh_systemd_enable:
dh_systemd_enable --name=icinga2
override_dh_auto_build: override_dh_auto_build:
dh_auto_build --parallel dh_auto_build --parallel
@ -20,8 +23,12 @@ ifeq ($(shell test -d .git && echo "git"),git) # verify we are in a GIT repo
endif endif
# now clean build dir # now clean build dir
dh_auto_clean dh_auto_clean
test ! -f third-party/cmake/GNUInstallDirs.cmake.disabled || \
mv third-party/cmake/GNUInstallDirs.cmake.disabled third-party/cmake/GNUInstallDirs.cmake
override_dh_auto_configure: override_dh_auto_configure:
test -f third-party/cmake/GNUInstallDirs.cmake.disabled || \
mv third-party/cmake/GNUInstallDirs.cmake third-party/cmake/GNUInstallDirs.cmake.disabled
dh_auto_configure -- \ dh_auto_configure -- \
-DCMAKE_INSTALL_LOCALSTATEDIR=/var \ -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
@ -29,8 +36,8 @@ override_dh_auto_configure:
-DICINGA2_USER=nagios \ -DICINGA2_USER=nagios \
-DICINGA2_GROUP=nagios \ -DICINGA2_GROUP=nagios \
-DICINGA2_COMMAND_GROUP=www-data \ -DICINGA2_COMMAND_GROUP=www-data \
-DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins \ -DICINGA2_UNITY_BUILD=TRUE \
-DICINGA2_UNITY_BUILD=TRUE -DICINGA2_PLUGINDIR=/usr/lib/nagios/plugins
override_dh_auto_install: override_dh_auto_install:
dh_auto_install dh_auto_install
@ -39,6 +46,7 @@ override_dh_auto_install:
override_dh_install: override_dh_install:
dh_install dh_install
chmod +x debian/icinga2-common/usr/lib/icinga2/prepare-dirs
# remove ido files from other packages # remove ido files from other packages
if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi if [ -d debian/icinga2-common/ ]; then rm debian/icinga2-common/etc/icinga2/features-available/ido-*; fi
rm debian/icinga2-bin/usr/lib/*/icinga2/libdb_ido_* rm debian/icinga2-bin/usr/lib/*/icinga2/libdb_ido_*
@ -51,7 +59,6 @@ override_dh_install:
done; \ done; \
done done
override_dh_installinit: override_dh_installinit:
dh_installinit --name=icinga2 dh_installinit --name=icinga2
@ -59,4 +66,4 @@ override_dh_installinit:
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=icinga2-dbg dh_strip --dbg-package=icinga2-dbg
# vi: noexpandtab : # vi: noexpandtab ts=4 sw=4 :