On Mon, Jul 20, 2009 at 07:37:51AM +0200, Christian Perrier wrote: > Quoting Justin B Rye (jbr@edlug.org.uk): > > > Good edits, but isn't this template largely obsolete? The only > > Apache in Debian post-oldstable is apache2, so this multiselect > > boils down to a boolean, which would be phrased quite differently. > > Agreed. That template and the relevant code in .config and .postinst > scripts should be dropped. Right, good call. Stu, do you want to review patch to inlude code changes or just templates? I don't mind either way. > > Once it has been updated to only handle one web server, we won't > > need the "(s)", and might as well be specific. Also, it's not > > working very "automatically" if it stops to ask me for permission > > before performing its single invariant action... JBR: > I'd be inclined to try to force all the short descriptions into a > common "$SUITE - $ELEMENT" format: Ooo, that's rather elegant :) Ok, new patch attached. -- Jonathan Wiltshire 1024D: 0xDB800B52 / 4216 F01F DCA9 21AC F3D3 A903 CA6B EA3E DB80 0B52 4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
--- /home/jona/debian/rewrite/ganglia/ganglia.old/debian/ganglia-webfrontend.templates 2009-07-09 08:27:51.000000000 +0100 +++ /home/jona/debian/rewrite/ganglia/ganglia/debian/ganglia-webfrontend.templates 2009-07-22 16:54:45.000000000 +0100 @@ -1,15 +1,14 @@ Template: ganglia-webfrontend/webserver -Type: multiselect -_Choices: apache, apache-ssl, apache-perl, apache2 -Default: apache, apache-ssl, apache-perl, apache2 -_Description: Which web servers should restart automatically: - If you do not select a web server to reconfigure automatically, - ganglia-webfrontend will not be usable until you reconfigure your - webserver to enable ganglia-webfrontend. +Type: boolean +Default: false +_Description: Automatically configure apache2? + The ganglia front-end will be unavailable until a web server is configured. + Automatic configuration can be performed for the Apache 2 web server. Template: ganglia-webfrontend/restart Type: boolean Default: false -_Description: Restart of your webserver(s) - Remember that in order to activate the new configuration the webserver(s) have - to be restarted. You can also restart your webserver manually. +_Description: Restart apache2? + In order to activate the new configuration the web server needs + to be restarted. If you choose not to do this automatically, you should + do so manually at the first opportunity. --- /home/jona/debian/rewrite/ganglia/ganglia.old/debian/control 2009-07-09 08:27:51.000000000 +0100 +++ /home/jona/debian/rewrite/ganglia/ganglia/debian/control 2009-07-22 17:12:48.000000000 +0100 @@ -9,9 +9,9 @@ Package: ganglia-monitor Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1 (=${binary:Version}) -Description: cluster system monitoring daemon +Description: cluster monitoring toolkit - node daemon Ganglia is a scalable, real-time cluster monitoring environment - with that collects cluster statistics in an open well-defined XML format. + that collects cluster statistics in an open and well-defined XML format. . This package contains the monitor core program. @@ -19,20 +19,20 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, libganglia1 (=${binary:Version}) Suggests: ganglia-monitor, ganglia-webfrontend -Description: meta-daemon for ganglia cluster monitoring toolkit +Description: cluster monitoring toolkit - Ganglia Meta-Daemon Ganglia is a scalable, real-time cluster monitoring environment - with that collects cluster statistics in an open well-defined XML format. + that collects cluster statistics in an open and well-defined XML format. . - This package contains the 'gmetad', which collects information from ganglia - monitor clients, and writes them to RRD databases. + This package contains the 'gmetad' daemon, which collects information from + ganglia monitor clients, and writes them to RRD databases. Package: libganglia1 Architecture: any Section: libs Depends: ${misc:Depends}, ${shlibs:Depends} -Description: ganglia cluster system monitor toolkit (shared libraries) +Description: cluster monitoring toolkit - shared libraries Ganglia is a scalable, real-time cluster monitoring environment - with that collects cluster statistics in an open well-defined XML format. + that collects cluster statistics in an open and well-defined XML format. . This package contains shared libraries. @@ -40,9 +40,9 @@ Architecture: any Section: libdevel Depends: ${misc:Depends}, libganglia1 (=${binary:Version}), ${shlibs:Depends} -Description: ganglia cluster system monitor toolkit (devel libraries) +Description: cluster monitoring toolkit - development libraries Ganglia is a scalable, real-time cluster monitoring environment - with that collects cluster statistics in an open well-defined XML format. + that collects cluster statistics in an open and well-defined XML format. . This package contains development libraries. @@ -50,10 +50,10 @@ Architecture: all Depends: ${misc:Depends}, apache | apache-ssl | apache-perl | apache2, php5 | php5-cgi | libapache2-mod-php5, rrdtool, debconf (>= 0.5), libgd2-noxpm | libgd2-xpm Recommends: gmetad, php5-gd -Description: ganglia cluster monitoring toolkit web frontend +Description: cluster monitoring toolkig - web front-end Ganglia is a scalable, real-time cluster monitoring environment - with that collects cluster statistics in an open well-defined XML + that collects cluster statistics in an open and well-defined XML format. . - This package contains the PHP based web frontend, which displays + This package contains the PHP-based web front-end, which displays information gathered by 'gmetad'.
Attachment:
signature.asc
Description: Digital signature