[Openstack-devel] Bug#709000: [RFR] templates://horizon/{openstack-dashboard-apache.templates}
Justin B Rye
justin.byam.rye at gmail.com
Mon Jun 3 07:18:55 UTC 2013
Christian PERRIER wrote:
> _Description: Activate Dashboard and disable default VirtualHost?
> + The Apache package sets up a default web site and a default page, configured
> + in /etc/apache2/sites-available/default.
> + .
> + Please choose this option to replace it by the Openstack Dashboard configuration.
OpenSSStack. Choose this option to replace... this option?
Also, if we're explaining that the only way to get X is to select Y,
we don't need to start by politely urging them to select Y (after all,
they might not want X).
Choose this option to replace that default with the OpenStack Dashboard
configuration.
>
> Template: horizon/use_ssl
> Type: boolean
> Default: true
> _Description: Should the Dashboard be installed on HTTPS?
> - Please choose if you would like Horizon to be installed on HTTPS only, with a
> + Please select this option if you would like Horizon to be installed on HTTPS only, with a
> redirection to HTTPS if HTTP is in use.
>
> Ou standard wording.
>
> I'm not fond of "installed on HTTPS". That sounds a bit Frenglish to
> me...:-). Even in French, indeed, the website is not installed "sur
> HTTPS".
>
> Justin?
I needed to sleep on it! Yes, I would talk about sites being
"available over" HTTPS, but not "installed on" HTTPS. Maybe the
answer is for the installation process not to talk about installing:
_Description: Should the Dashboard use HTTPS?
Select this option if you would like Horizon to be served over HTTPS only,
with a redirection to HTTPS if HTTP is in use.
The other reason I put this off until the morning is the package
description:
> Package: python-django-horizon
[....]
> Description: Django module providing web interaction with OpenStack
> The OpenStack Dashboard is a Web application allowing to control an OpenStack
^^^^^^^^^^^
Disallowed. Besides, it doesn't *permit* it, it *does* it.
Also, lowercase "web" to match the synopsis.
> cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
^^^^^^^^^ ^^^^
(A double-weaselled list)
> using the Openstack REST API just like you would do with the command line
> clients.
(A use of "like" unpopular with English teachers)
Rephrased boilerplate:
The OpenStack Dashboard is a web application to control an OpenStack
cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
using the Openstack REST API just as you would with the command line
clients.
> .
> Horizon is a Django module that permits interaction with an OpenStack
> cloud. It can be used to build a dashboard to control an OpenStack cloud.
(Again the useless use of the concept of permission. A can of
sardines could claim on the label that it *permits* interaction with
the cloud; after all, it does nothing to hinder it.)
> Package: openstack-dashboard
> Description: OpenStack Dashboard
$BOILERPLATE
Not the most explanatory of short descriptions, but never mind.
> Package: openstack-dashboard-apache
> Description: OpenStack Dashboard - Apache support
$BOILERPLATE
> This package includes the configuration files to use within Apache. If you
> wish to configure Apache yourself, use only openstack-dashboard.
Oddly but harmlessly phrased.
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package
-------------- next part --------------
diff -ru horizon-2013.1.1.pristine/debian/control horizon-2013.1.1/debian/control
--- horizon-2013.1.1.pristine/debian/control 2013-05-17 10:04:34.000000000 +0100
+++ horizon-2013.1.1/debian/control 2013-06-03 08:16:49.901265785 +0100
@@ -61,9 +61,9 @@
python-tz,
Recommends: memcached
Description: Django module providing web interaction with OpenStack
- The OpenStack Dashboard is a Web application allowing to control an OpenStack
- cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
- using the Openstack REST API just like you would do with the command line
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the Openstack REST API just as you would with the command line
clients.
.
Horizon is a Django module that permits interaction with an OpenStack
@@ -83,9 +83,9 @@
libapache2-mod-wsgi (>= 2.3)
Recommends: memcached, openstack-dashboard-apache
Description: OpenStack Dashboard
- The OpenStack Dashboard is a Web application allowing to control an OpenStack
- cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
- using the Openstack REST API just like you would do with the command line
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the Openstack REST API just as you would with the command line
clients.
Package: openstack-dashboard-apache
@@ -95,9 +95,9 @@
openstack-dashboard,
${misc:Depends}
Description: OpenStack Dashboard - Apache support
- The OpenStack Dashboard is a Web application allowing to control an OpenStack
- cloud. It connects to OpenStack services including Nova, Swift, Keystone, etc.
- using the Openstack REST API just like you would do with the command line
+ The OpenStack Dashboard is a web application to control an OpenStack
+ cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
+ using the Openstack REST API just as you would with the command line
clients.
.
This package includes the configuration files to use within Apache. If you
diff -ru horizon-2013.1.1.pristine/debian/openstack-dashboard-apache.templates horizon-2013.1.1/debian/openstack-dashboard-apache.templates
--- horizon-2013.1.1.pristine/debian/openstack-dashboard-apache.templates 2013-05-17 10:04:34.000000000 +0100
+++ horizon-2013.1.1/debian/openstack-dashboard-apache.templates 2013-06-03 07:51:16.833841089 +0100
@@ -11,13 +11,15 @@
Type: boolean
Default: false
_Description: Activate Dashboard and disable default VirtualHost?
- In Debian, Apache comes with a default website and a default page, configured
- in /etc/apache2/sites-available/default. Select if this configuration should be
- disabled and replaced by the Openstack Dashboard configuration.
+ The Apache package sets up a default web site and a default page, configured
+ in /etc/apache2/sites-available/default.
+ .
+ Choose this option to replace that default with the OpenStack Dashboard
+ configuration.
Template: horizon/use_ssl
Type: boolean
Default: true
-_Description: Should the Dashboard be installed on HTTPS?
- Please choose if you would like Horizon to be installed on HTTPS only, with a
- redirection to HTTPS if HTTP is in use.
+_Description: Should the Dashboard use HTTPS?
+ Select this option if you would like Horizon to be served over HTTPS only,
+ with a redirection to HTTPS if HTTP is in use.
-------------- next part --------------
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english at lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
Template: horizon/activate_vhost
Type: boolean
Default: false
_Description: Activate Dashboard and disable default VirtualHost?
The Apache package sets up a default web site and a default page, configured
in /etc/apache2/sites-available/default.
.
Choose this option to replace that default with the OpenStack Dashboard
configuration.
Template: horizon/use_ssl
Type: boolean
Default: true
_Description: Should the Dashboard use HTTPS?
Select this option if you would like Horizon to be served over HTTPS only,
with a redirection to HTTPS if HTTP is in use.
-------------- next part --------------
Source: horizon
Section: net
Priority: extra
Maintainer: PKG OpenStack <openstack-devel at lists.alioth.debian.org>
Uploaders: Loic Dachary (OuoU) <loic at debian.org>,
Julien Danjou <acid at debian.org>,
Thomas Goirand <zigo at debian.org>,
Ghe Rivero <ghe.rivero at stackops.com>,
Mehdi Abaakouk <sileht at sileht.net>
Build-Depends: debhelper (>= 9),
po-debconf,
python-all (>= 2.6.6-3~),
python-setuptools
Build-Depends-Indep: openstack-pkg-tools,
pep8 (>= 1.3.3),
python-cloudfiles,
python-compressor,
python-coverage,
python-django-nose,
python-docutils,
python-glanceclient,
python-cinderclient,
python-keystoneclient,
python-mox,
python-netaddr,
python-nose,
python-nosexcover,
python-novaclient (>= 2:2.10),
python-openstack-auth,
python-quantumclient (>= 1:2.0),
python-sphinx,
python-swiftclient,
python-tz,
pylint,
nodejs-legacy,
node-less
Standards-Version: 3.9.3
Homepage: http://horizon.openstack.org
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/horizon.git;a=summary
Vcs-Git: git://anonscm.debian.org/openstack/horizon.git
Package: python-django-horizon
Section: python
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${python:Depends},
python-cinderclient,
python-cloudfiles,
python-compressor,
python-django,
python-django-nose,
python-glanceclient,
python-keystoneclient,
python-lockfile,
python-memcache,
python-netaddr,
python-novaclient (>= 2:2.10),
python-openstack-auth,
python-quantumclient (>= 1:2.0),
python-swiftclient,
python-tz,
Recommends: memcached
Description: Django module providing web interaction with OpenStack
The OpenStack Dashboard is a web application to control an OpenStack
cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
using the Openstack REST API just as you would with the command line
clients.
.
Horizon is a Django module that permits interaction with an OpenStack
cloud. It can be used to build a dashboard to control an OpenStack cloud.
Package: openstack-dashboard
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
python-django-horizon (= ${source:Version}),
libjs-jquery,
libjs-jquery-cookie,
node-less,
adduser,
libapache2-mod-wsgi (>= 2.3)
Recommends: memcached, openstack-dashboard-apache
Description: OpenStack Dashboard
The OpenStack Dashboard is a web application to control an OpenStack
cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
using the Openstack REST API just as you would with the command line
clients.
Package: openstack-dashboard-apache
Architecture: all
Pre-Depends: dpkg (>= 1.15.6~)
Depends: debconf,
openstack-dashboard,
${misc:Depends}
Description: OpenStack Dashboard - Apache support
The OpenStack Dashboard is a web application to control an OpenStack
cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
using the Openstack REST API just as you would with the command line
clients.
.
This package includes the configuration files to use within Apache. If you
wish to configure Apache yourself, use only openstack-dashboard.
More information about the Openstack-devel
mailing list