edits
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f50e26e1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f50e26e1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f50e26e1 Branch: refs/heads/ldapplugin Commit: f50e26e153fb39fa7daf0d2ca9ccd625905dcd70 Parents: 954e197 Author: radhikap <[email protected]> Authored: Wed Jul 17 11:35:28 2013 +0530 Committer: radhikap <[email protected]> Committed: Wed Jul 17 11:35:53 2013 +0530 ---------------------------------------------------------------------- .../add-password-management-to-templates.xml | 25 ++++--- docs/en-US/linux-installation.xml | 70 ++++++++++++-------- docs/en-US/windows-installation.xml | 9 ++- 3 files changed, 65 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f50e26e1/docs/en-US/add-password-management-to-templates.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/add-password-management-to-templates.xml b/docs/en-US/add-password-management-to-templates.xml index 581e564..60de951 100644 --- a/docs/en-US/add-password-management-to-templates.xml +++ b/docs/en-US/add-password-management-to-templates.xml @@ -21,13 +21,22 @@ specific language governing permissions and limitations under the License. --> - <section id="add-password-management-to-templates"> - <title>Adding Password Management to Your Templates</title> - <para>&PRODUCT; provides an optional password reset feature that allows users to set a temporary admin or root password as well as reset the existing admin or root password from the &PRODUCT; UI.</para> - <para>To enable the Reset Password feature, you will need to download an additional script to patch your template. When you later upload the template into &PRODUCT;, you can specify whether reset admin/root password feature should be enabled for this template.</para> - <para>The password management feature works always resets the account password on instance boot. The script does an HTTP call to the virtual router to retrieve the account password that should be set. As long as the virtual router is accessible the guest will have access to the account password that should be used. When the user requests a password reset the management server generates and sends a new password to the virtual router for the account. Thus an instance reboot is necessary to effect any password changes.</para> - <para>If the script is unable to contact the virtual router during instance boot it will not set the password but boot will continue normally.</para> - <xi:include href="linux-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> - <xi:include href="windows-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"; /> + <title>Adding Password Management to Your Templates</title> + <para>&PRODUCT; provides an optional password reset feature that allows users to set a temporary + admin or root password as well as reset the existing admin or root password from the &PRODUCT; + UI.</para> + <para>To enable the Reset Password feature, you will need to download an additional script to + patch your template. When you later upload the template into &PRODUCT;, you can specify whether + reset admin/root password feature should be enabled for this template.</para> + <para>The password management feature works always resets the account password on instance boot. + The script does an HTTP call to the virtual router to retrieve the account password that should + be set. As long as the virtual router is accessible the guest will have access to the account + password that should be used. When the user requests a password reset the management server + generates and sends a new password to the virtual router for the account. Thus an instance + reboot is necessary to effect any password changes.</para> + <para>If the script is unable to contact the virtual router during instance boot it will not set + the password but boot will continue normally.</para> + <xi:include href="linux-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <xi:include href="windows-installation.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f50e26e1/docs/en-US/linux-installation.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/linux-installation.xml b/docs/en-US/linux-installation.xml index b560ee0..57dbc88 100644 --- a/docs/en-US/linux-installation.xml +++ b/docs/en-US/linux-installation.xml @@ -22,32 +22,50 @@ under the License. --> <section id="linux-installation"> - <title>Linux OS Installation</title> - <para>Use the following steps to begin the Linux OS installation:</para> - <orderedlist> - <listitem><para>Download the script file cloud-set-guest-password:</para> - <itemizedlist> - <listitem><para>Linux: <ulink url=" + <title>Linux OS Installation</title> + <para>Use the following steps to begin the Linux OS installation:</para> + <orderedlist> + <listitem> + <para>Download the script file cloud-set-guest-password:</para> + <itemizedlist> + <listitem> + <para>Linux: <ulink url=" http://cloudstack.org/dl/cloud-set-guest-password - "></ulink> - </para></listitem> - <listitem><para>Windows: <ulink url=" + "/> + </para> + </listitem> + <listitem> + <para>Windows: <ulink + url=" http://sourceforge.net/projects/cloudstack/files/Password%20Management%20Scripts/CloudInstanceManager.msi/download - "></ulink> - </para></listitem> - </itemizedlist> - </listitem> - <listitem><para>Copy this file to /etc/init.d.</para><para>On some Linux distributions, copy the file to /etc/rc.d/init.d.</para> - </listitem> - <listitem><para>Run the following command to make the script executable:</para><programlisting>chmod +x /etc/init.d/cloud-set-guest-password</programlisting> - </listitem> - <listitem><para>Depending on the Linux distribution, continue with the appropriate step.</para><para>On Fedora, CentOS/RHEL, and Debian, run:</para><programlisting>chkconfig --add cloud-set-guest-password</programlisting> - <para condition="community">On Ubuntu with VMware tools, link the script file to the /etc/network/if-up and - /etc/network/if-down folders, and run the script:</para> - <programlisting condition="community">#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password + " + /> + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para>Copy this file to /etc/init.d.</para> + <para>On some Linux distributions, copy the file to /etc/rc.d/init.d.</para> + </listitem> + <listitem> + <para>Run the following command to make the script executable:</para> + <programlisting>chmod +x /etc/init.d/cloud-set-guest-password</programlisting> + </listitem> + <listitem> + <para>Depending on the Linux distribution, continue with the appropriate step.</para> + <para>On Fedora, CentOS/RHEL, and Debian, run:</para> + <programlisting>chkconfig --add cloud-set-guest-password</programlisting> + <para condition="community">On Ubuntu with VMware tools, link the script file to the + /etc/network/if-up and /etc/network/if-down folders, and run the script:</para> + <programlisting condition="community">#ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-up/cloud-set-guest-password #ln -s /etc/init.d/cloud-set-guest-password /etc/network/if-down/cloud-set-guest-password</programlisting> - <para condition="community">If you are using Ubuntu 11.04, start by creating a directory called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version of Ubuntu). On all Ubuntu versions: Run âsudo update-rc.d cloud-set-guest-password defaults 98â. To test, run "mkpasswd" and check that it is generating a new password. If the âmkpasswdâ command does not exist, run "sudo apt-get install whois" (or sudo apt-get install mkpasswd, depending on your Ubuntu version) and repeat.</para> - </listitem> - </orderedlist> - - </section> + <para condition="community">If you are using Ubuntu 11.04, start by creating a directory + called /var/lib/dhcp3 on your Ubuntu machine (works around a known issue with this version + of Ubuntu). On all Ubuntu versions: Run âsudo update-rc.d cloud-set-guest-password defaults + 98â. To test, run "mkpasswd" and check that it is generating a new password. If the + âmkpasswdâ command does not exist, run "sudo apt-get install whois" (or sudo apt-get install + mkpasswd, depending on your Ubuntu version) and repeat.</para> + </listitem> + </orderedlist> +</section> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f50e26e1/docs/en-US/windows-installation.xml ---------------------------------------------------------------------- diff --git a/docs/en-US/windows-installation.xml b/docs/en-US/windows-installation.xml index bcecc80..29c84b4 100644 --- a/docs/en-US/windows-installation.xml +++ b/docs/en-US/windows-installation.xml @@ -22,9 +22,8 @@ under the License. --> <section id="windows-installation"> - <title>Windows OS Installation</title> - <para>Download the installer, CloudInstanceManager.msi, from - <ulink url="http://cloudstack.org/download.html";>Download page</ulink> - and run the installer in the newly created Windows VM. - </para> + <title>Windows OS Installation</title> + <para>Download the installer, CloudInstanceManager.msi, from <ulink + url="http://cloudstack.org/download.html";>Download page</ulink> and run the installer in the + newly created Windows VM. </para> </section>
