From e31341a91eb09706b0e00f328259f6ea7728241f Mon Sep 17 00:00:00 2001 From: Goran Nushkov Date: Thu, 18 Oct 2018 13:49:06 +0200 Subject: [PATCH] fixed ubuntu-18.04 support --- doc/maintaining/installing/install-from-source.rst | 11 +++++++++++ doc/maintaining/installing/solr.rst | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/doc/maintaining/installing/install-from-source.rst b/doc/maintaining/installing/install-from-source.rst index 2ee49d894b1..3cb0055bf9c 100644 --- a/doc/maintaining/installing/install-from-source.rst +++ b/doc/maintaining/installing/install-from-source.rst @@ -79,6 +79,17 @@ a. Create a Python `virtual environment `_ .. parsed-literal:: + sudo mkdir -p |virtualenv| + sudo chown \`whoami\` |virtualenv| + virtualenv --no-site-packages |virtualenv| + |activate| + + .. note:: + + If you are using ``python3`` and if you are having problems installing the + requirements using ``pip`` inside the virtual environment, explicitly + install ``python2.7`` inside the virtual environment. + sudo mkdir -p |virtualenv| sudo chown \`whoami\` |virtualenv| virtualenv --python=/usr/bin/python2.7 --no-site-packages |virtualenv| diff --git a/doc/maintaining/installing/solr.rst b/doc/maintaining/installing/solr.rst index 7a0890de4a2..01b308f7fad 100644 --- a/doc/maintaining/installing/solr.rst +++ b/doc/maintaining/installing/solr.rst @@ -12,7 +12,7 @@ installed, we need to install and configure Solr. server, but CKAN doesn't require Jetty - you can deploy Solr to another web server, such as Tomcat, if that's convenient on your operating system. -.. important:: +.. tip:: Do this step only if your system is using ``jetty9``. @@ -105,4 +105,4 @@ installed, we need to install and configure Solr. #. Finally, change the :ref:`solr_url` setting in your :ref:`config_file` (|production.ini|) to point to your Solr server, for example:: - solr_url=http://127.0.0.1:8983/solr + solr_url=http://127.0.0.1:8983/solr \ No newline at end of file