Merge branch 'deployment-doc-fix' of https://github.com/mattrm/ckan i…

…nto mattrm-deployment-doc-fix
tanmayAccela · Jan 15, 2015 · 1260dd9 · 1260dd9
2 parents 5afd4af + 12ccd3f
commit 1260dd9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/doc/maintaining/installing/deployment.rst b/doc/maintaining/installing/deployment.rst
@@ -198,11 +198,13 @@ following contents:
 9. Enable your CKAN site
 ------------------------
 
-Finally, enable your CKAN site in Apache:
+To prevent conflicts, disable your default nginx and apache sites.  Finally, enable your CKAN site in Apache:
 
 .. parsed-literal::
 
     sudo a2ensite ckan_default
+    sudo a2dissite default
+    sudo rm -vi /etc/nginx/sites-enabled/default
     sudo ln -s |nginx_config_file| /etc/nginx/sites-enabled/ckan_default
     |reload_apache|
     |reload_nginx|