Please find, for review, the debconf templates and packages descriptions for the icinga source package. This review will last from Sunday, April 18, 2010 to Wednesday, April 28, 2010. Please send reviews as unified diffs (diff -u) against the original files. Comments about your proposed changes will be appreciated. Your review should be sent as an answer to this mail. When appropriate, I will send intermediate requests for review, with "[RFRn]" (n>=2) as a subject tag. When we will reach a consensus, I send a "Last Chance For Comments" mail with "[LCFC]" as a subject tag. Finally, the reviewed templates will be sent to the package maintainer as a bug report, and a mail will be sent to this list with "[BTS]" as a subject tag. Rationale: --- icinga.old/debian/icinga-cgi.templates 2010-04-10 07:17:10.808313291 +0200 +++ icinga/debian/icinga-cgi.templates 2010-04-14 08:14:49.727471925 +0200 @@ -3,7 +3,7 @@ Choices: apache2 Default: apache2 _Description: Apache servers to configure for icinga: - Please select which apache servers should be configured for icinga. + Please select which Apache servers should be configured for icinga. . If you would prefer to perform configuration manually, leave all servers unselected. Properly capitalize Apache. @@ -13,14 +13,18 @@ _Description: Icinga web administration password: Please provide the password to be created with the "icingaadmin" user. . - This is the username and password you will use to log in to your icinga - installation after configuration is complete. If you do not provide - a password, you will have to configure access to icinga yourself. + This is the username and password to use when connecting to the icinga + server after completing the configuration. If you do not provide + a password, you will have to configure access to icinga manually + later on. This is not necessarily the person we talk to who will use that user/pwd. Template: icinga/adminpassword-repeat Type: password -_Description: Password confirmation: +_Description: Re-enter password to verify: + Please enter the same user password again to verify you have typed it + correctly. Re-use the same template from D-I which we re-used in many similar situations too. Template: icinga/adminpassword-mismatch -Type: note -_Description: The passwords do not match +Type: error +_Description: Password input error + The two passwords you entered were not the same. Please try again. Ditto. --- icinga.old/debian/control 2010-04-10 07:17:10.812312752 +0200 +++ icinga/debian/control 2010-04-14 08:22:23.235492654 +0200 @@ -12,11 +12,11 @@ Architecture: all Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends} Recommends: icinga-plugins -Description: support files for icinga +Description: monitoring and management system for network hosts - support files Icinga is a monitoring and management system for hosts, services and - networks. icinga-common contains the common files for the icinga package. + networks. . - Icingas features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) "support files for icinga" doesn't tell what is icinga...:-) Let's use a general description as boilerplate for the synopsis, the usual " - " separator and the common specific words to describe each package. The following chunks do this for each and every binary package. Turn this package description into a boilerplate that we'll be reusing for other packages. @@ -27,17 +27,19 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga is designed to be easy to understand and modify to fit your own needs. + Icinga is designed to be easy to understand and modify to fit any need. + . + This package contains the common files for all Icinga packages. "not only my needs"..:-) The last paragraph is the only one that's specific for this package. In latter chunks, most changes are mostly reappying these changes so I won't go into details.
Template: icinga/httpd Type: multiselect Choices: apache2 Default: apache2 _Description: Apache servers to configure for icinga: Please select which Apache servers should be configured for icinga. . If you would prefer to perform configuration manually, leave all servers unselected. Template: icinga/adminpassword Type: password _Description: Icinga web administration password: Please provide the password to be created with the "icingaadmin" user. . This is the username and password to use when connecting to the icinga server after completing the configuration. If you do not provide a password, you will have to configure access to icinga manually later on. Template: icinga/adminpassword-repeat Type: password _Description: Re-enter password to verify: Please enter the same user password again to verify you have typed it correctly. Template: icinga/adminpassword-mismatch Type: error _Description: Password input error The two passwords you entered were not the same. Please try again.
--- icinga.old/debian/icinga-cgi.templates 2010-04-10 07:17:10.808313291 +0200 +++ icinga/debian/icinga-cgi.templates 2010-04-14 08:14:49.727471925 +0200 @@ -3,7 +3,7 @@ Choices: apache2 Default: apache2 _Description: Apache servers to configure for icinga: - Please select which apache servers should be configured for icinga. + Please select which Apache servers should be configured for icinga. . If you would prefer to perform configuration manually, leave all servers unselected. @@ -13,14 +13,18 @@ _Description: Icinga web administration password: Please provide the password to be created with the "icingaadmin" user. . - This is the username and password you will use to log in to your icinga - installation after configuration is complete. If you do not provide - a password, you will have to configure access to icinga yourself. + This is the username and password to use when connecting to the icinga + server after completing the configuration. If you do not provide + a password, you will have to configure access to icinga manually + later on. Template: icinga/adminpassword-repeat Type: password -_Description: Password confirmation: +_Description: Re-enter password to verify: + Please enter the same user password again to verify you have typed it + correctly. Template: icinga/adminpassword-mismatch -Type: note -_Description: The passwords do not match +Type: error +_Description: Password input error + The two passwords you entered were not the same. Please try again. --- icinga.old/debian/control 2010-04-10 07:17:10.812312752 +0200 +++ icinga/debian/control 2010-04-14 08:22:23.235492654 +0200 @@ -12,11 +12,11 @@ Architecture: all Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends} Recommends: icinga-plugins -Description: support files for icinga +Description: monitoring and management system for network hosts - support files Icinga is a monitoring and management system for hosts, services and - networks. icinga-common contains the common files for the icinga package. + networks. . - Icingas features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -27,17 +27,19 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga is designed to be easy to understand and modify to fit your own needs. + Icinga is designed to be easy to understand and modify to fit any need. + . + This package contains the common files for all Icinga packages. Package: icinga-cgi Architecture: any Depends: icinga-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libjs-scriptaculous, libjs-prototype, libjs-mootools Recommends: apache2 | httpd, nagios-images (>> 0.1) -Description: cgi files for icinga +Description: monitoring and management system for network hosts - CGI scripts Icinga is a monitoring and management system for hosts, services and - networks. icinga-common contains the common files for the icinga package. + networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -48,17 +50,19 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga is designed to be easy to understand and modify to fit your own needs. + Icinga is designed to be easy to understand and modify to fit any need. + . + This package provides CGI script files. Package: icinga-idoutils Architecture: any Depends: icinga-common (= ${source:Version}), ucf, dbconfig-common, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.0-6), libdbd-mysql | libdbd-pgsql Recommends: mysql-client | postgresql-client -Description: icinga-dataobjects support +Description: monitoring and management system for network hosts - icinga-dataobjects support Icinga is a monitoring and management system for hosts, services and - networks. icinga-common contains the common files for the icinga package. + networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -69,20 +73,20 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga is designed to be easy to understand and modify to fit your own needs. - . + Icinga is designed to be easy to understand and modify to fit any need. + . This package contains icinga-dataobjects support which makes it possible to - import icinga statusinformations in to a SQL database. + import Icinga statusinformations into an SQL database. Package: icinga Architecture: any Depends: icinga-core (= ${binary:Version}), icinga-cgi (= ${binary:Version}), ${misc:Depends} Suggests: nagios-nrpe-plugin -Description: A host/service/network monitoring and management system +Description: monitoring and management system for network hosts - metapackage Icinga is a monitoring and management system for hosts, services and networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -93,9 +97,8 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga was written in C and is designed to be easy to understand and modify - to fit your own needs. - . + Icinga is designed to be easy to understand and modify to fit any need. + . This is a metapackage which depends on the icinga core and the webfrontend Package: icinga-core @@ -103,11 +106,11 @@ Depends: ${shlibs:Depends}, icinga-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends} Suggests: nagios-nrpe-plugin Replaces: icinga -Description: A host/service/network monitoring and management system core files +Description: monitoring and management system for network hosts - core files Icinga is a monitoring and management system for hosts, services and networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -118,20 +121,19 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - This package included the icinga core without the webfrontend - . - Icinga was written in C and is designed to be easy to understand and modify - to fit your own needs. + Icinga is designed to be easy to understand and modify to fit any need. + . + This package provides the core of Icinga without the web frontend. Package: icinga-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} -Description: documentation for icinga +Description: monitoring and management system for network hosts - documentation Icinga is a monitoring and management system for hosts, services and networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -142,18 +144,19 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga was written in C and is designed to be easy to understand and modify - to fit your own needs. + Icinga is designed to be easy to understand and modify to fit any need. + . + This package provides the documentation for Icinga. Package: icinga-phpapi Architecture: all Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, php5 | php5-cgi | php5-cli | libapache2-mod-php5 Recommends: icinga-idoutils, php5-mysql | php5-pgsql -Description: phpapi for icinga +Description: monitoring and management system for network hosts - PHP API Icinga is a monitoring and management system for hosts, services and networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -164,22 +167,21 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga was written in C and is designed to be easy to understand and modify - to fit your own needs. - . - This package contains the phpapi to access idoutils and livestatus information - from php. + Icinga is designed to be easy to understand and modify to fit any need. + . + This package provides the API needed to access idoutils and livestatus information + from PHP. Package: icinga-dbg Section: debug Priority: extra Architecture: any Depends: icinga-core (= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} -Description: debugging symbols and debug stuff for icinga +Description: monitoring and management system for network hosts - debug files Icinga is a monitoring and management system for hosts, services and networks. . - Icinga's features include: + Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) @@ -190,8 +192,7 @@ (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . - Icinga was written in C and is designed to be easy to understand and modify - to fit your own needs. + Icinga is designed to be easy to understand and modify to fit any need. . - This package contains gdb debugging symbols for the icinga binaries and the + This package provides gdb debugging symbols for the Icinga binaries and the mini_epn tool which can help in debugging Icinga problems.
Source: icinga Section: net Priority: optional Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org> Uploaders: Alexander Wirt <formorer@debian.org>, Jan Wagner <waja@cyconet.org> Standards-Version: 3.8.4 Build-Depends: debhelper (>= 7), dpatch (>= 2.0.10), po-debconf, libperl-dev, libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping, autotools-dev, dpkg-dev (>= 1.13.19), libdbi0-dev Package: icinga-common Architecture: all Depends: nagios-plugins-basic, coreutils (>= 4.5.3), bsd-mailx | mailx, adduser, lsb-base (>= 3.0-6), ucf (>= 0.28), ${misc:Depends}, ${perl:Depends}, ${misc:Depends} Recommends: icinga-plugins Description: monitoring and management system for network hosts - support files Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package contains the common files for all Icinga packages. Package: icinga-cgi Architecture: any Depends: icinga-common (= ${source:Version}), coreutils (>= 4.5.3), ucf (>= 0.28), apache2-utils, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, adduser, libjs-scriptaculous, libjs-prototype, libjs-mootools Recommends: apache2 | httpd, nagios-images (>> 0.1) Description: monitoring and management system for network hosts - CGI scripts Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package provides CGI script files. Package: icinga-idoutils Architecture: any Depends: icinga-common (= ${source:Version}), ucf, dbconfig-common, ${misc:Depends}, ${perl:Depends}, ${misc:Depends}, ${shlibs:Depends}, lsb-base (>= 3.0-6), libdbd-mysql | libdbd-pgsql Recommends: mysql-client | postgresql-client Description: monitoring and management system for network hosts - icinga-dataobjects support Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package contains icinga-dataobjects support which makes it possible to import Icinga statusinformations into an SQL database. Package: icinga Architecture: any Depends: icinga-core (= ${binary:Version}), icinga-cgi (= ${binary:Version}), ${misc:Depends} Suggests: nagios-nrpe-plugin Description: monitoring and management system for network hosts - metapackage Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This is a metapackage which depends on the icinga core and the webfrontend Package: icinga-core Architecture: any Depends: ${shlibs:Depends}, icinga-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends} Suggests: nagios-nrpe-plugin Replaces: icinga Description: monitoring and management system for network hosts - core files Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package provides the core of Icinga without the web frontend. Package: icinga-doc Architecture: all Section: doc Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends} Description: monitoring and management system for network hosts - documentation Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package provides the documentation for Icinga. Package: icinga-phpapi Architecture: all Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, php5 | php5-cgi | php5-cli | libapache2-mod-php5 Recommends: icinga-idoutils, php5-mysql | php5-pgsql Description: monitoring and management system for network hosts - PHP API Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package provides the API needed to access idoutils and livestatus information from PHP. Package: icinga-dbg Section: debug Priority: extra Architecture: any Depends: icinga-core (= ${binary:Version}), ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: monitoring and management system for network hosts - debug files Icinga is a monitoring and management system for hosts, services and networks. . Features include: . * Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP, PING, etc.) * Plugin interface to allow for user-developed service checks * Contact notifications when problems occur and get resolved (via email, pager, or user-defined method) * Ability to define event handlers to be run during service or host events (for proactive problem resolution) * Web output (current status, notifications, problem history, log file, etc.) . Icinga is designed to be easy to understand and modify to fit any need. . This package provides gdb debugging symbols for the Icinga binaries and the mini_epn tool which can help in debugging Icinga problems.
Attachment:
signature.asc
Description: Digital signature