doc: Updated manual install to include sync agent, ARM packages, and DNS configuration.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>

diff --git a/doc/radosgw/manual-install.rst b/doc/radosgw/manual-install.rst
index aad4fec08ce6b409d74e7d6bdeace6e226d54f5b..6b9b7e59d1f3570393de803eb5fe965f21905f06 100644 (file)
--- a/doc/radosgw/manual-install.rst
+++ b/doc/radosgw/manual-install.rst
@@ -2,15 +2,14 @@
  Install Apache, FastCGI and Gateway
 =====================================
 
-.. note:: If you deploy Ceph with Chef cookbooks, you may skip this section. 
-
 Install Packages
-----------------
+================
 
 To install Ceph Object Gateway, you must install Apache and FastCGI first. :: 
 
        sudo apt-get update && sudo apt-get install apache2 libapache2-mod-fastcgi
 
+
 100-Continue Support
 --------------------
        
@@ -23,8 +22,10 @@ FastCGI packages modified for Ceph here:
 
 - `Apache Oneiric`_
 - `Apache Precise`_
+- `Apache Quantal for ARM (Calxeda)`_
 - `FastCGI Oneric`_
 - `FastCGI Precise`_
+- `FastCGI Quantal for ARM (Calxeda)`_
 
 You may also clone Ceph's Apache and FastCGI git repositories:: 
 
@@ -33,8 +34,10 @@ You may also clone Ceph's Apache and FastCGI git repositories::
 
 .. _Apache Oneiric: http://gitbuilder.ceph.com/apache2-deb-oneiric-x86_64-basic/ 
 .. _Apache Precise: http://gitbuilder.ceph.com/apache2-deb-precise-x86_64-basic/
+.. _Apache Quantal for ARM (Calxeda): http://gitbuilder.ceph.com/apache2-deb-quantal-arm7l-basic/
 .. _FastCGI Oneric: http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-oneiric-x86_64-basic/ 
 .. _FastCGI Precise: http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-precise-x86_64-basic/
+.. _FastCGI Quantal for ARM (Calxeda): http://gitbuilder.ceph.com/libapache-mod-fastcgi-deb-quantal-arm7l-basic/
 .. _RFC 2616, Section 8: http://www.w3.org/Protocols/rfc2616/rfc2616-sec8.html 
 
 .. important:: If you do NOT use a modified fastcgi as described above,
@@ -43,17 +46,19 @@ You may also clone Ceph's Apache and FastCGI git repositories::
 
        rgw print continue = false
 
+
 Apache Configuration
---------------------
+====================
 
 Enable the URL rewrite modules for Apache and FastCGI. For example:: 
 
        sudo a2enmod rewrite
        sudo a2enmod fastcgi
        
-By default, the ``/etc/apache2/httpd.conf`` file is blank.     Add a line for the
-``ServerName`` and provide the fully qualified domain name of the host where 
-you will install RADOS GW. For example:: 
+By default, the ``/etc/apache2/httpd.conf`` or ``/etc/apache2/apache2.conf``
+file is blank. Add a line for the ``ServerName`` and provide the fully
+qualified domain name of the host where  you will install the Ceph Object
+Gateway. For example:: 
        
        ServerName {fqdn}
        
@@ -61,9 +66,9 @@ Restart Apache so that the foregoing changes take effect. ::
 
        sudo service apache2 restart
        
-Then, install Ceph Object Gateway. For example:: 
+Then, install Ceph Object Gateway and its sync agent. For example:: 
 
-       sudo apt-get install radosgw
+       sudo apt-get install radosgw radosgw-agent
 
 
 Enable SSL
@@ -79,6 +84,49 @@ Once you enable SSL, you should generate an SSL certificate. ::
        sudo mkdir /etc/apache2/ssl
        sudo openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/apache2/ssl/apache.key -out /etc/apache2/ssl/apache.crt
 
+
+.. note:: The foregoing example uses self-certified certificates. Some client
+   APIs check for a trusted certificate authority. So you may need to obtain
+   a SSL certificate from a trusted authority to use those client APIs.
+
 Then, restart Apache. ::
 
        service apache2 restart
+
+
+Add Wildcard to DNS
+===================
+
+To use Ceph with S3-style subdomains (e.g., ``bucket-name.domain-name.com``),
+you need to add a wildcard to the DNS record of the DNS server you use with the
+``radosgw`` daemon.
+
+.. tip:: The address of the DNS must also be specified in the Ceph 
+   configuration file with the ``rgw dns name = {hostname}`` setting.
+
+For ``dnsmasq``, consider addding the following ``address`` setting with a dot
+(.) prepended to the host name:: 
+
+       address=/.{hostname-or-fqdn}/{host-ip-address}
+       address=/.ceph-node/192.168.0.1
+
+For ``bind``, consider adding the a wildcard to the DNS record::
+
+       $TTL    604800
+       @       IN      SOA     ceph-node. root.ceph-node. (
+                                     2         ; Serial
+                                604800         ; Refresh
+                                 86400         ; Retry
+                               2419200         ; Expire
+                                604800 )       ; Negative Cache TTL
+       ;
+       @       IN      NS      ceph-node.
+       @       IN      A       192.168.122.113
+       *       IN      CNAME   @
+
+Restart your DNS server and ping your server with a subdomain to 
+ensure that your Ceph Object Store ``radosgw`` daemon can process
+the subdomain requests. :: 
+
+       ping mybucket.{fqdn}
+       ping mybucket.ceph-node