[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [RFR] templates://dtc-xen/{templates}



Christian Perrier wrote:
> Please send reviews as unified diffs (diff -u) against the original
> files. Comments about your proposed changes will be appreciated.

A couple of things in the the templates; again I'll inline a diff
against the RFR and attach one against the original.

> Template: dtc-xen/conf_node_number
...
>  Assuming this value is 'XXXX', the node number will be 'xenXXXXYY',
>  YY beingis the VPS number itself (xenYY). This node number must be 4
>  or 5 characters long.

Typo(?), "beingis".

> Template: dtc-xen/conf_debian_repository
...
>  Please enter the repository to use for creating VPS (Virtual Private
>  Servers).

Styleguides disagree about the correct spelling of plurals like this
(OSes/OSs/OS's...) but fortunately the templates can stick to
singular "the VPS (Virtual Private Server)". 

> Template: dtc-xen/conf_netmask
...
>  Please enter the network mask to use in the created Virtual Private
>  Servers network settings.

Possessive singular ("the Server's settings") needs an apostrophe.
Likewise in dtc-xen/conf_network, -broadcast and -gateway.

Diff against the RFR:

--- templates~	2007-04-06 21:13:27.000000000 +0100
+++ templates	2007-04-06 21:21:49.000000000 +0100
@@ -36,7 +36,7 @@
  Please enter the value to use to set up VPS numbering.
  .
  Assuming this value is 'XXXX', the node number will be 'xenXXXXYY',
- YY beingis the VPS number itself (xenYY). This node number must be 4
+ YY being the VPS number itself (xenYY). This node number must be 4
  or 5 characters long.
  .
  As a consequence of this choice, the server's hostname will be
@@ -47,8 +47,8 @@
 Type: string
 Default: ftp://ftp.us.debian.org/debian
 _Description: Debian repository for VPS creation:
- Please enter the repository to use for creating VPS (Virtual Private
- Servers). The current /etc/apt/sources.list file will be copied the
+ Please enter the repository to use for creating the VPS (Virtual Private
+ Server). The current /etc/apt/sources.list file will be copied to the
  created VPS so the repository you enter here will be used only during
  the debootstrap stage of the VPS creation.
 
@@ -57,28 +57,28 @@
 Default: 255.255.255.0
 _Description: Network mask for the VPS:
  Please enter the network mask to use in the created Virtual Private
- Servers network settings.
+ Server's network settings.
 
 Template: dtc-xen/conf_network
 Type: string
 Default: 192.168.60.0
 _Description: Network address for the VPS:
  Please enter the network address to use in the created Virtual Private
- Servers network settings.
+ Server's network settings.
 
 Template: dtc-xen/conf_broadcast
 Type: string
 Default: 192.168.60.255
 _Description: Broadcast address for the VPS:
  Please enter the network broadcast address to use in the created
- Virtual Private Servers network settings.
+ Virtual Private Server's network settings.
 
 Template: dtc-xen/conf_gateway
 Type: string
 Default: 192.168.60.254
 _Description: Gateway address for the VPS:
  Please enter the network gateway address to use in the created
- Virtual Private Servers network settings.
+ Virtual Private Server's network settings.
 
 Template: dtc-xen/conf_linux_kernel_name
 Type: string
--- templates.old	2007-04-06 23:55:38.000000000 +0100
+++ templates.new	2007-04-06 21:21:49.000000000 +0100
@@ -1,107 +1,120 @@
 Template: dtc-xen/conf_soap_port
 Type: string
 Default: 8089
-Description: Server port:
- What port should it bind to? Default is 8089.
+_Description: Server port:
+ Please enter the port the server will bind to.
 
 Template: dtc-xen/conf_soap_login
 Type: string
 Default: dtc-xen
-Description: SOAP server login:
- dtc-xen will bind a SOAP python server on which a dtc panel can connect to
- in order to start, stop create and destroy a VPS. What login do you want
- to create on that server.
+_Description: SOAP server login:
+ Dtc-xen will bind a SOAP Python server (to which a dtc panel can connect, in
+ order to start, stop, create and destroy a VPS).
+ .
+ Please enter the login name to connect to the server.
 
 Template: dtc-xen/conf_soap_pass
 Type: password
 Default: dtc-xen
-Description: SOAP server pass:
- dtc-xen will generate a password (in a .htpasswd file) that will hold the
- password for the login you have just configured. What password do you want
- to have generated in it?
+_Description: SOAP server pass:
+ Dtc-xen will generate a .htpasswd file for the login you have just
+ configured.
+ .
+ Please enter the password to use in that file.
 
 Template: dtc-xen/conf_soap_domain_name
 Type: string
 Default: example.com
-Description: Server hostname:
- What will be the domain name for this dtc-xen server? This will be used as a
+_Description: Server hostname:
+ Please enter the domain name for the dtc-xen server. This will be used as a
  part of the URL by the SOAP dtc panel client.
 
 Template: dtc-xen/conf_node_number
 Type: string
 Default: 0101
-Description: VPS Server node number:
- dtc-xen will use that number as a VPS Server number and will make your VPS
- numbering using xenXXXXYY with X being the server number (what it's are
- asking you at the moment) and Y being the VPS number itself (xenYY). Note
- that this node number has to be between 4 and 5 chars, and that it will
- create something like nodeXXXX.example.com that will be your server
- hostname (which you can later add in your DTC control panel).
+_Description: VPS Server node number:
+ Please enter the value to use to set up VPS numbering.
+ .
+ Assuming this value is 'XXXX', the node number will be 'xenXXXXYY',
+ YY being the VPS number itself (xenYY). This node number must be 4
+ or 5 characters long.
+ .
+ As a consequence of this choice, the server's hostname will be
+ nodeXXXX.example.com (which you can later add in your DTC control
+ panel).
 
 Template: dtc-xen/conf_debian_repository
 Type: string
 Default: ftp://ftp.us.debian.org/debian
-Description: Debian repository for setting-up VPSes:
- dtc-xen will use that repository for creating VPSes, and will copy your
- /etc/apt/sources.list inside your VPS (so this will be used ONLY durring
- the debootstrap stage of the VPS creation).
+_Description: Debian repository for VPS creation:
+ Please enter the repository to use for creating the VPS (Virtual Private
+ Server). The current /etc/apt/sources.list file will be copied to the
+ created VPS so the repository you enter here will be used only during
+ the debootstrap stage of the VPS creation.
 
 Template: dtc-xen/conf_netmask
 Type: string
 Default: 255.255.255.0
-Description: Netmask to be setup in the VPSes:
- Please enter the Netmask to use when doing the VPS network customization
- when dtc-xen creates a VPS.
+_Description: Network mask for the VPS:
+ Please enter the network mask to use in the created Virtual Private
+ Server's network settings.
 
 Template: dtc-xen/conf_network
 Type: string
 Default: 192.168.60.0
-Description: Network to be setup in the VPSes:
- Please enter the Network address to use when doing the VPS network
- customization when dtc-xen creates a VPS.
+_Description: Network address for the VPS:
+ Please enter the network address to use in the created Virtual Private
+ Server's network settings.
 
 Template: dtc-xen/conf_broadcast
 Type: string
 Default: 192.168.60.255
-Description: Broadcast to be setup in the VPSes:
- Please enter the network broadcast address to use when doing the VPS
- network customization when dtc-xen creates a VPS.
+_Description: Broadcast address for the VPS:
+ Please enter the network broadcast address to use in the created
+ Virtual Private Server's network settings.
 
 Template: dtc-xen/conf_gateway
 Type: string
 Default: 192.168.60.254
-Description: Gateway to be setup in the VPSes:
- Please enter the network gateway address to use when doing the VPS network
- customization when dtc-xen creates a VPS.
+_Description: Gateway address for the VPS:
+ Please enter the network gateway address to use in the created
+ Virtual Private Server's network settings.
 
 Template: dtc-xen/conf_linux_kernel_name
 Type: string
 Default: 2.6.16.27-xenU
-Description: Xen Kernel release name:
- Enter here the kernel version number as it appears in the uname -a. A
- kernel domU with that name must be located in /boot (example:
- vmlinuz-2.6.16.27-xenU) and it's corresponding modules must be in
+_Description: Xen kernel release name:
+ Please enter the kernel version number as it appears with the
+ 'uname -a' command. 
+ .
+ A kernel domU with that name must be located in /boot (example:
+ vmlinuz-2.6.16.27-xenU) and its corresponding modules must be in
  /lib/modules.
 
 Template: dtc-xen/conf_lvm_name
 Type: string
 Default: lvm1
-Description: Volume group where to create VPS:
- dtc-xen creates physical partitions in a lvm volume group that you have to
- name here. This volume group has to be big enough to hold all the VMs you will
- setup later on this server. If you don't want to use lvm (because you don't
- care if loopback is slower), leave this as default and dtc-xen wont use it
- anyway.
+_Description: Volume group to create VPS in:
+ Dtc-xen creates physical partitions in an existing LVM volume group
+ .
+ Please enter that volume group name. The volume group size must fit
+ all the virtual machiness you will set up later on this server. If
+ you don't want to use LVM (because you don't care if loopback is
+ slower), leave this setting to the default value.
 
 Template: dtc-xen/conf_info_finish_setup
 Type: note
-Description: How to finish the install
+_Description: Installation completion
  To finish the installation, you need to launch
- /usr/sbin/dtc-xen_finish_install. This script will remove port
- forwarding from your sshd_config and add the grant of xm console
- to the group xenusers so your users can loggin to the physical
- console. It will then try to download the files needed to setup
- Gentoo and CentOS into your VMs. Note that the system is currently
- safe (nobody can connect to a physical console as xenXX, they will
- be rejected because the /etc/sudoers is not changed), but a basic
- user wont be able to log into his physical console using ssh.
+ /usr/sbin/dtc-xen_finish_install. 
+ .
+ This script will remove port forwarding from the current sshd_config
+ file and add the grant of xm console to the group xenusers so that
+ users can login to the physical console. It will then try to
+ download the files needed to setup Gentoo and CentOS into the
+ virtual machines. 
+ .
+ Please note that the system is currently safe (connections to a
+ physical console as xenXX will be rejected because the /etc/sudoers
+ is not changed), but a basic user won't be able to log into his
+ physical console using ssh.
Template: dtc-xen/conf_soap_port
Type: string
Default: 8089
_Description: Server port:
 Please enter the port the server will bind to.

Template: dtc-xen/conf_soap_login
Type: string
Default: dtc-xen
_Description: SOAP server login:
 Dtc-xen will bind a SOAP Python server (to which a dtc panel can connect, in
 order to start, stop, create and destroy a VPS).
 .
 Please enter the login name to connect to the server.

Template: dtc-xen/conf_soap_pass
Type: password
Default: dtc-xen
_Description: SOAP server pass:
 Dtc-xen will generate a .htpasswd file for the login you have just
 configured.
 .
 Please enter the password to use in that file.

Template: dtc-xen/conf_soap_domain_name
Type: string
Default: example.com
_Description: Server hostname:
 Please enter the domain name for the dtc-xen server. This will be used as a
 part of the URL by the SOAP dtc panel client.

Template: dtc-xen/conf_node_number
Type: string
Default: 0101
_Description: VPS Server node number:
 Please enter the value to use to set up VPS numbering.
 .
 Assuming this value is 'XXXX', the node number will be 'xenXXXXYY',
 YY being the VPS number itself (xenYY). This node number must be 4
 or 5 characters long.
 .
 As a consequence of this choice, the server's hostname will be
 nodeXXXX.example.com (which you can later add in your DTC control
 panel).

Template: dtc-xen/conf_debian_repository
Type: string
Default: ftp://ftp.us.debian.org/debian
_Description: Debian repository for VPS creation:
 Please enter the repository to use for creating the VPS (Virtual Private
 Server). The current /etc/apt/sources.list file will be copied to the
 created VPS so the repository you enter here will be used only during
 the debootstrap stage of the VPS creation.

Template: dtc-xen/conf_netmask
Type: string
Default: 255.255.255.0
_Description: Network mask for the VPS:
 Please enter the network mask to use in the created Virtual Private
 Server's network settings.

Template: dtc-xen/conf_network
Type: string
Default: 192.168.60.0
_Description: Network address for the VPS:
 Please enter the network address to use in the created Virtual Private
 Server's network settings.

Template: dtc-xen/conf_broadcast
Type: string
Default: 192.168.60.255
_Description: Broadcast address for the VPS:
 Please enter the network broadcast address to use in the created
 Virtual Private Server's network settings.

Template: dtc-xen/conf_gateway
Type: string
Default: 192.168.60.254
_Description: Gateway address for the VPS:
 Please enter the network gateway address to use in the created
 Virtual Private Server's network settings.

Template: dtc-xen/conf_linux_kernel_name
Type: string
Default: 2.6.16.27-xenU
_Description: Xen kernel release name:
 Please enter the kernel version number as it appears with the
 'uname -a' command. 
 .
 A kernel domU with that name must be located in /boot (example:
 vmlinuz-2.6.16.27-xenU) and its corresponding modules must be in
 /lib/modules.

Template: dtc-xen/conf_lvm_name
Type: string
Default: lvm1
_Description: Volume group to create VPS in:
 Dtc-xen creates physical partitions in an existing LVM volume group
 .
 Please enter that volume group name. The volume group size must fit
 all the virtual machiness you will set up later on this server. If
 you don't want to use LVM (because you don't care if loopback is
 slower), leave this setting to the default value.

Template: dtc-xen/conf_info_finish_setup
Type: note
_Description: Installation completion
 To finish the installation, you need to launch
 /usr/sbin/dtc-xen_finish_install. 
 .
 This script will remove port forwarding from the current sshd_config
 file and add the grant of xm console to the group xenusers so that
 users can login to the physical console. It will then try to
 download the files needed to setup Gentoo and CentOS into the
 virtual machines. 
 .
 Please note that the system is currently safe (connections to a
 physical console as xenXX will be rejected because the /etc/sudoers
 is not changed), but a basic user won't be able to log into his
 physical console using ssh.

Reply to: