openstack/openstack-manuals
Code Issues Proposed changes

Merge "Apache is the foundation. Apache http server is the product. Also, start instructions for RH platforms where it's called httpd rather than apache2."

Browse Source
This commit is contained in:
Jenkins 2013-10-08 20:12:00 +00:00 committed by Gerrit Code Review
commit a24144fc5c
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/common/section_about-dashboard.xml
View File

@ -13,15 +13,15 @@
</listitem>
<listitem>
<para>Install the OpenStack Dashboard framework, including
Apache and related modules.</para>
Apache http server and related modules.</para>
</listitem>
<listitem>
<para>Configure the dashboard.</para>
<para>Then, restart and run the Apache server.</para>
<para>Then, restart and run the Apache http server.</para>
</listitem>
<listitem>
<para>Verify your installation by going to the URL of the
Apache server you configured.</para>
Apache http server you configured.</para>
</listitem>
</orderedlist>
<simplesect>

9
doc/common/section_dashboard-configure-http.xml
View File

@ -25,9 +25,12 @@
Configuration</link>.</para>
</step>
<step>
<para>Restart Apache and memcached:</para>
<screen><prompt>#</prompt> <userinput>service apache2 restart</userinput>
<prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
<para>Restart Apache http server. For Ubuntu/Debian/SUSE:</para>
<screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
<para>or for Fedora/RHEL/CentOS:</para>
<screen><prompt>#</prompt> <userinput>service httpd restart</userinput></screen>
<para>Next, restart memcached:</para>
<screen><prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
</step>
</procedure>
</section>

11
doc/common/section_dashboard-configure-https.xml
View File

@ -84,16 +84,19 @@ Allow from all
# Require all granted
&lt;/Directory&gt;
&lt;/VirtualHost&gt;</programlisting>
<para>In this configuration, Apache listens on the
<para>In this configuration, Apache http server listens on the
port 443 and redirects all the hits to the HTTPS
protocol for all the non-secured requests. The secured
section defines the private key, public key, and
certificate to use.</para>
</step>
<step>
<para>Restart Apache and memcached:</para>
<screen><prompt>#</prompt> <userinput>service apache2 restart</userinput>
<prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
<para>Restart Apache http server. For Debian/Ubuntu/SUSE:</para>
<screen><prompt>#</prompt> <userinput>service apache2 restart</userinput></screen>
<para>Or for Fedora/RHEL/CentOS:</para>
<screen><prompt>#</prompt> <userinput>service httpd restart</userinput></screen>
<para>Next, restart memcached:</para>
<screen><prompt>#</prompt> <userinput>service memcached restart</userinput></screen>
<para>If you try to access the dashboard through HTTP,
the browser redirects you to the HTTPS page.</para>
</step>