[Pkg-nagios-devel] Bug#677843: [RFR] templates://icinga-web/{icinga-web.templates}

[Justin B Rye]

Christian PERRIER wrote:
> Your review should be sent as an answer to this mail.

(By the way, I'll be on reduced bandwidth again later this week.)

I don't see anything that needs changing in the templates, and I
recognise the boilerplate in the package descriptions, but:

> Package: icinga-web
[...]
>  This package provides the new webinterface to view Icinga monitoring
>  results and send commands to the Icinga Core. Host and service status,
>  history, notifications and status maps are available to keep a check on
>  the health of your network in real-time.

s/webinterface/web interface/; and it's "in real time".
 
> Package: icinga-web-pnp
[...]
> Description: host and network monitoring system - modern web interface plugin for pnp4nagios
[...]

Too long, and oddly phrased - is the interface modern, or is it the
plugin?  Is the plugin "for" Icinga or PNP4Nagios?  Try:

  Description: host and network monitoring system - PNP4NAgios web plugin

[...]
>  This package provides a plugin for Icinga new webinterface integrating
                                            ^       ^        ^
>  pnp4nagios into the interface for accessing the pnp4nagio data directly.
   ^^^ ^                                           ^^^ ^    ^
Some clunky repetitions, a couple of spelling problems and a parsing
ambiguity: is it saying "integrating X into the interface which is
used for doing Y" or is it "integrating X into the interface, for the
sake of doing Y"?  Simplify to:

   This package provides a plugin for Icinga's new web interface,
   integrating PNP4Nagios to provide direct access to its data.

-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
-------------- next part --------------
diff -ru old/control new/control
--- old/control	2012-06-17 14:45:59.547392328 +0100
+++ new/control	2012-06-17 14:56:23.087392590 +0100
@@ -38,15 +38,15 @@
   * web output: current status, notifications, problem history, log
     file, etc.
  .
- This package provides the new webinterface to view Icinga monitoring
+ This package provides the new web interface to view Icinga monitoring
  results and send commands to the Icinga Core. Host and service status,
  history, notifications and status maps are available to keep a check on
- the health of your network in real-time.
+ the health of your network in real time.
 
 Package: icinga-web-pnp
 Architecture: all
 Depends: icinga-web (= ${source:Version}), pnp4nagios, ${misc:Depends}
-Description: host and network monitoring system - modern web interface plugin for pnp4nagios
+Description: host and network monitoring system - PNP4NAgios web plugin
  Icinga is a modular monitoring framework for hosts, services, and
  networks, based on the Nagios project. It is designed to be easy to
  understand and modify to fit any need.
@@ -62,5 +62,5 @@
   * web output: current status, notifications, problem history, log
     file, etc.
  .
- This package provides a plugin for Icinga new webinterface integrating
- pnp4nagios into the interface for accessing the pnp4nagio data directly.
+ This package provides a plugin for Icinga's new web interface,
+ integrating PNP4Nagios to provide direct access to its data.
diff -ru old/icinga-web.templates new/icinga-web.templates
--- old/icinga-web.templates	2012-06-17 14:45:58.215392556 +0100
+++ new/icinga-web.templates	2012-06-17 14:46:25.331392692 +0100
@@ -1,9 +1,9 @@
 Template: icinga-web/httpd
 Type: multiselect
-Choices: apache2
+__Choices: apache2
 Default: apache2
-_Description: Apache servers to configure for icinga:
- Please select which Apache servers should be configured for icinga.
+_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.
@@ -11,19 +11,19 @@
 Template: icinga-web/rootpassword
 Type: password
 _Description: Icinga new web administrative password:
- Please provide the password for the user "root" in the webinterface.
+ Please provide the password for the user "root" in Icinga's web interface.
  .
- This is password you need to access the webinterface with the
- default administrative user. After login you will be able
- to create new users and set permissions for the users.
+ This is the password you need to access the web interface with the
+ default administrative user. After login, you will be able
+ to create new users and set their permissions.
  .
- Please be aware that the password will be reset to this password
- after each run of the postinstall process.
+ Please be aware that the password will be reset to this value
+ each time the package is upgraded.
 
 Template: icinga-web/rootpassword-repeat
 Type: password
-_Description: Please re-enter the password:
- Please enter the same user password again to verify you have typed it
+_Description: Re-enter password to verify:
+ Please enter the same root password again to verify that you have typed it
  correctly.
 
 Template: icinga-web/rootpassword-mismatch
-------------- next part --------------
Template: icinga-web/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-web/rootpassword
Type: password
_Description: Icinga new web administrative password:
 Please provide the password for the user "root" in Icinga's web interface.
 .
 This is the password you need to access the web interface with the
 default administrative user. After login, you will be able
 to create new users and set their permissions.
 .
 Please be aware that the password will be reset to this value
 each time the package is upgraded.

Template: icinga-web/rootpassword-repeat
Type: password
_Description: Re-enter password to verify:
 Please enter the same root password again to verify that you have typed it
 correctly.

Template: icinga-web/rootpassword-mismatch
Type: error
_Description: Password input error
 The two passwords you entered were not the same. Please try again.

-------------- next part --------------
Source: icinga-web
Section: php
Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
Uploaders: Markus Frosch <markus at lazyfrosch.de>, Alexander Wirt <formorer at debian.org>
Build-Depends: autotools-dev, debhelper (>= 7.0.50~), po-debconf
Standards-Version: 3.9.3
Homepage: http://www.icinga.org
Vcs-Git: git://git.debian.org/git/pkg-nagios/pkg-icinga-web.git
Vcs-Browser: http://git.debian.org/?p=pkg-nagios/pkg-icinga-web.git;a=summary

Package: icinga-web
Architecture: all
Depends: dbconfig-common,
         icinga-core (>= 1.7.0),
         icinga-idoutils (>= 1.7.0),
         php5,
         php5-cli,
         php5-gd,
         php5-mysql | php5-pgsql,
         php5-xsl,
         ucf,
         ${misc:Depends}
Recommends: apache2 | httpd, mysql-client | postgresql-client
Description: host and network monitoring system - modern web interface
 Icinga is a modular monitoring framework for hosts, services, and
 networks, based on the Nagios project. It is designed to be easy to
 understand and modify to fit any need.
 .
 Features include:
  * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
    TCP port;
  * plugin interface to allow for user-developed service checks;
  * contact notifications when problems occur and get resolved (via
    email, pager, or user-defined method)
  * support for proactive problem resolution (handlers can be defined to
    be run during service or host events);
  * web output: current status, notifications, problem history, log
    file, etc.
 .
 This package provides the new web interface to view Icinga monitoring
 results and send commands to the Icinga Core. Host and service status,
 history, notifications and status maps are available to keep a check on
 the health of your network in real time.

Package: icinga-web-pnp
Architecture: all
Depends: icinga-web (= ${source:Version}), pnp4nagios, ${misc:Depends}
Description: host and network monitoring system - PNP4NAgios web plugin
 Icinga is a modular monitoring framework for hosts, services, and
 networks, based on the Nagios project. It is designed to be easy to
 understand and modify to fit any need.
 .
 Features include:
  * monitoring of network services via ping, SMTP, POP3, HTTP, NNTP, or
    TCP port;
  * plugin interface to allow for user-developed service checks;
  * contact notifications when problems occur and get resolved (via
    email, pager, or user-defined method)
  * support for proactive problem resolution (handlers can be defined to
    be run during service or host events);
  * web output: current status, notifications, problem history, log
    file, etc.
 .
 This package provides a plugin for Icinga's new web interface,
 integrating PNP4Nagios to provide direct access to its data.