[#1651] Update the deployment docs to work with Ubuntu 14.04

doc/conf.py

@@ -45,7 +45,7 @@
 .. |datastore_user| replace:: datastore_default
 .. |test_database| replace:: ckan_test
 .. |test_datastore| replace:: datastore_test
-.. |apache_config_file| replace:: /etc/apache2/sites-available/ckan_default
+.. |apache_config_file| replace:: /etc/apache2/sites-available/ckan_default.conf
 .. |apache.wsgi| replace:: |config_dir|/apache.wsgi
 .. |data_dir| replace:: |config_dir|/data
 .. |sstore| replace:: |config_dir|/sstore

doc/maintaining/installing/deployment.rst

@@ -138,6 +138,11 @@ following contents:
             RPAFsethostname On
             RPAFproxy_ips 127.0.0.1
         </IfModule>
+
+        <Directory />
+            Require all granted
+        </Directory>
+
     </VirtualHost>
 
 Replace ``default.ckanhosted.com`` and ``www.default.ckanhosted.com`` with the
@@ -151,18 +156,13 @@ requests to your CKAN instance.
 7. Modify the Apache ports.conf file
 ------------------------------------
 
-Open ``/etc/apache2/ports.conf``. Look in the file for the following lines:
-
-.. parsed-literal::
+Open ``/etc/apache2/ports.conf``. Change this line::
 
-    NameVirtualHost \*:80
-    Listen 80
+   Listen 80
 
-Change the entries from ``80`` to ``8080`` to look like the following:
+to::
 
-.. parsed-literal::
-    NameVirtualHost \*:8080
-    Listen 8080
+   Listen 8080
 
 -------------------------------
 8. Create the Nginx config file
@@ -194,11 +194,20 @@ following contents:
     }
 
 
-------------------------
-9. Enable your CKAN site
-------------------------
+-----------------------------------
+9. Disable the default |nginx| site
+-----------------------------------
+
+Run this command to disable the default |nginx| site::
+
+    sudo rm /etc/nginx/sites-enabled/default
+
+
+-------------------------
+10. Enable your CKAN site
+-------------------------
 
-Finally, enable your CKAN site in Apache:
+Finally, enable your CKAN site in Apache and |nginx|:
 
 .. parsed-literal::